diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-25 14:18:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 14:18:38 +0200 |
| commit | d94ac4b9497923db3188742e270db67ed7f0fb79 (patch) | |
| tree | d3aa9d1b53d27edf37b3e9edcf6c76b4babe46f1 | |
| parent | 7cbe12725ea675395fb38f1aaef2969ed8b66f67 (diff) | |
| parent | f471afa4a5d59afdc25c93e15d840809b44980af (diff) | |
Merge pull request #9837 from Noshyaar/pr-about
Label: update minimum size when regenerating wordcache
| -rw-r--r-- | editor/editor_about.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/label.cpp | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 2328a42a07..fd90c766fd 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -137,7 +137,6 @@ EditorAbout::EditorAbout() { tc->add_child(license_thirdparty); Label *tpl_label = memnew(Label); - tpl_label->set_custom_minimum_size(Size2(0, 64 * EDSCALE)); tpl_label->set_h_size_flags(Control::SIZE_EXPAND_FILL); tpl_label->set_autowrap(true); tpl_label->set_text(TTR("Godot Engine relies on a number of thirdparty free and open source libraries, all compatible with the terms of its MIT license. The following is an exhaustive list of all such thirdparty components with their respective copyright statements and license terms.")); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 589ba9e538..874156821e 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -36,7 +36,6 @@ void Label::set_autowrap(bool p_autowrap) { autowrap = p_autowrap; word_cache_dirty = true; - minimum_size_changed(); update(); } bool Label::has_autowrap() const { @@ -48,7 +47,6 @@ void Label::set_uppercase(bool p_uppercase) { uppercase = p_uppercase; word_cache_dirty = true; - minimum_size_changed(); update(); } bool Label::is_uppercase() const { @@ -71,7 +69,6 @@ void Label::_notification(int p_what) { xl_text = new_text; regenerate_word_cache(); - minimum_size_changed(); update(); } @@ -496,6 +493,7 @@ void Label::regenerate_word_cache() { minsize.height = (font->get_height() * line_count) + (line_spacing * (line_count - 1)); } + minimum_size_changed(); word_cache_dirty = false; } @@ -533,9 +531,6 @@ void Label::set_text(const String &p_string) { if (percent_visible < 1) visible_chars = get_total_character_count() * percent_visible; update(); - if (!autowrap) { - minimum_size_changed(); - } } void Label::set_clip_text(bool p_clip) { |