diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-25 07:53:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 07:53:55 +0200 |
| commit | 0a828dbd923723319d29ade6977191f90072ce9d (patch) | |
| tree | 6855fcae951edc252ba819ba8eb01404b652be44 | |
| parent | a0113a98e48da684481cd26a8ba079bb0a55d9b3 (diff) | |
| parent | 3369d090d9804aa2141600b6fcdaa18f6113fd48 (diff) | |
Merge pull request #64270 from timothyqiu/close-keying
Fix overlapping keying and remove button in Inspector
| -rw-r--r-- | editor/editor_inspector.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 73683eeb73..122e6ad021 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -340,6 +340,8 @@ void EditorProperty::_notification(int p_what) { draw_string(font, Point2(ofs, v_ofs + font->get_ascent(font_size)), label, HORIZONTAL_ALIGNMENT_LEFT, text_limit, font_size, color); } + ofs = size.width; + if (keying) { Ref<Texture2D> key; @@ -349,7 +351,7 @@ void EditorProperty::_notification(int p_what) { key = get_theme_icon(SNAME("Key"), SNAME("EditorIcons")); } - ofs = size.width - key->get_width() - get_theme_constant(SNAME("hseparator"), SNAME("Tree")); + ofs -= key->get_width() + get_theme_constant(SNAME("hseparator"), SNAME("Tree")); Color color2(1, 1, 1); if (keying_hover) { @@ -373,7 +375,7 @@ void EditorProperty::_notification(int p_what) { close = get_theme_icon(SNAME("Close"), SNAME("EditorIcons")); - ofs = size.width - close->get_width() - get_theme_constant(SNAME("hseparator"), SNAME("Tree")); + ofs -= close->get_width() + get_theme_constant(SNAME("hseparator"), SNAME("Tree")); Color color2(1, 1, 1); if (delete_hover) { |