diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-25 09:16:38 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-25 09:16:38 +0100 |
| commit | fd66a86d725f4fb0f42a737018a4d2f0ebfd40c5 (patch) | |
| tree | 07c2ae3d975efffc2449cb4cf12027d78bbf6fc5 /scene/gui/rich_text_label.h | |
| parent | 2ac8d401b0a3fd2d6567c9980f9df6570e2d0a1f (diff) | |
| parent | e59d6b1b8c0b13ac2686368c6e9e6b9b74008504 (diff) | |
Merge pull request #71330 from Geometror/richtextlabel-fit-content
[RichTextLabel] Match minimum size calculation of Label (proper content fitting)
Diffstat (limited to 'scene/gui/rich_text_label.h')
| -rw-r--r-- | scene/gui/rich_text_label.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index 8ac77d5b47..58b82d4672 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -524,9 +524,7 @@ private: bool use_bbcode = false; String text; - int fixed_width = -1; - - bool fit_content_height = false; + bool fit_content = false; struct ThemeCache { Ref<StyleBox> normal_style; @@ -640,8 +638,8 @@ public: void set_shortcut_keys_enabled(bool p_enabled); bool is_shortcut_keys_enabled() const; - void set_fit_content_height(bool p_enabled); - bool is_fit_content_height_enabled() const; + void set_fit_content(bool p_enabled); + bool is_fit_content_enabled() const; bool search(const String &p_string, bool p_from_selection = false, bool p_search_previous = false); @@ -731,7 +729,6 @@ public: void install_effect(const Variant effect); - void set_fixed_size_to_width(int p_width); virtual Size2 get_minimum_size() const override; RichTextLabel(const String &p_text = String()); |