diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-16 23:40:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 23:40:00 +0200 |
| commit | 60d67f93c6757834be912a48f2ca23b31a69ad5f (patch) | |
| tree | 6845ddcb1322ad0d80cbe484b6a0a7bc845a8d19 /scene/gui/rich_text_label.h | |
| parent | 191c34eb0d0d66fc6b5aac7d7f281fbd76171cd4 (diff) | |
| parent | 053b3b946c8373bbacf964af865fc4b9f89e8e2a (diff) | |
Merge pull request #39148 from HaSa1002/rtl
Remove bbcode_text from RichTextLabel
Diffstat (limited to 'scene/gui/rich_text_label.h')
| -rw-r--r-- | scene/gui/rich_text_label.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index f25a8bf193..806f684b67 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -85,7 +85,6 @@ public: protected: void _notification(int p_what); static void _bind_methods(); - void _validate_property(PropertyInfo &property) const override; private: struct Item; @@ -452,16 +451,19 @@ private: virtual Dictionary parse_expressions_for_values(Vector<String> p_expressions); void _draw_fbg_boxes(RID p_ci, RID p_rid, Vector2 line_off, Item *it_from, Item *it_to, int start, int end, int fbg_flag); - +#ifndef DISABLE_DEPRECATED + // Kept for compatibility from 3.x to 4.0. + bool _set(const StringName &p_name, const Variant &p_value); +#endif bool use_bbcode = false; - String bbcode; + String text; int fixed_width = -1; bool fit_content_height = false; public: - String get_text(); + String get_parsed_text() const; void add_text(const String &p_text); void add_image(const Ref<Texture2D> &p_image, const int p_width = 0, const int p_height = 0, const Color &p_color = Color(1.0, 1.0, 1.0), InlineAlign p_align = INLINE_ALIGN_CENTER); void add_newline(); @@ -548,15 +550,13 @@ public: void selection_copy(); Error parse_bbcode(const String &p_bbcode); - Error append_bbcode(const String &p_bbcode); + Error append_text(const String &p_bbcode); void set_use_bbcode(bool p_enable); bool is_using_bbcode() const; - void set_bbcode(const String &p_bbcode); - String get_bbcode() const; - - void set_text(const String &p_string); + void set_text(const String &p_bbcode); + String get_text() const; void set_text_direction(TextDirection p_text_direction); TextDirection get_text_direction() const; |