gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-21 07:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61726 from YeldhamDev/always_clear

Browse source 
Take into account the clear icon's size even when not visible in `LineEdit`s
This commit is contained in:
Rémi Verschelde 2022-06-07 14:16:13 +02:00 committed by GitHub
parent 7f5c10b588 71c8fb26e0
commit 70757ad7df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/gui/line_edit.cpp
View file

@ -1686,13 +1686,17 @@ Size2 LineEdit::get_minimum_size() const {
min_size.height = MAX(TS->shaped_text_get_size(text_rid).y + font->get_spacing(TextServer::SPACING_TOP) + font->get_spacing(TextServer::SPACING_BOTTOM), font->get_height(font_size));
// Take icons into account.
bool using_placeholder = text.is_empty() && ime_text.is_empty();
bool display_clear_icon = !using_placeholder && is_editable() && clear_button_enabled;
if (right_icon.is_valid() || display_clear_icon) {
Ref<Texture2D> r_icon = display_clear_icon ? Control::get_theme_icon(SNAME("clear")) : right_icon;
min_size.width += r_icon->get_width();
min_size.height = MAX(min_size.height, r_icon->get_height());
int icon_max_width = 0;
if (right_icon.is_valid()) {
min_size.height = MAX(min_size.height, right_icon->get_height());
icon_max_width = right_icon->get_width();
}
if (clear_button_enabled) {
Ref<Texture2D> clear_icon = Control::get_theme_icon(SNAME("clear"));
min_size.height = MAX(min_size.height, clear_icon->get_height());
icon_max_width = MAX(icon_max_width, clear_icon->get_width());
}
min_size.width += icon_max_width;
return style->get_minimum_size() + min_size;
}