From 8aa30eee2fd73db1ff135e00d5bae1fc21470570 Mon Sep 17 00:00:00 2001 From: FireForge Date: Sun, 13 Feb 2022 22:12:53 -0600 Subject: [PATCH] Fix EditorProperty text and icon overlap bugs (cherry picked from commit dbc380af59b28de8243f945c6cb965bee83efadf) --- editor/editor_inspector.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index a1c4af37663..981c0d3e2c7 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -238,7 +238,7 @@ void EditorProperty::_notification(int p_what) { } int ofs = get_constant("font_offset"); - int text_limit = text_size; + int text_limit = text_size - ofs; if (checkable) { Ref checkbox; @@ -256,8 +256,10 @@ void EditorProperty::_notification(int p_what) { } check_rect = Rect2(ofs, ((size.height - checkbox->get_height()) / 2), checkbox->get_width(), checkbox->get_height()); draw_texture(checkbox, check_rect.position, color2); - ofs += get_constant("hseparator", "Tree") + checkbox->get_width() + get_constant("hseparation", "CheckBox"); - text_limit -= ofs; + + int check_ofs = get_constant("hseparator", "Tree") + checkbox->get_width() + get_constant("hseparation", "CheckBox"); + ofs += check_ofs; + text_limit -= check_ofs; } else { check_rect = Rect2(); } @@ -265,7 +267,7 @@ void EditorProperty::_notification(int p_what) { if (can_revert) { Ref reload_icon = get_icon("ReloadSmall", "EditorIcons"); text_limit -= reload_icon->get_width() + get_constant("hseparator", "Tree") * 2; - revert_rect = Rect2(text_limit + get_constant("hseparator", "Tree"), (size.height - reload_icon->get_height()) / 2, reload_icon->get_width(), reload_icon->get_height()); + revert_rect = Rect2(ofs + text_limit, (size.height - reload_icon->get_height()) / 2, reload_icon->get_width(), reload_icon->get_height()); Color color2(1, 1, 1); if (revert_hover) {