godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix drawing of checkable editor properties 

- Make text cutoff respect checkbox icon's width
  - Get checkbox icon from EditorIcons instead of CheckBox

(cherry picked from commit c230c6db98)
This commit is contained in:
James Buck 2019-04-22 20:33:53 -05:00 committed by Rémi Verschelde
parent d4704234b3
commit 2854864130
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_inspector.cpp
View File

@ -211,12 +211,14 @@ void EditorProperty::_notification(int p_what) {
} }
int ofs = 0; int ofs = 0;
int text_limit = text_size;
if (checkable) { if (checkable) {
Ref<Texture> checkbox; Ref<Texture> checkbox;
if (checked) if (checked)
checkbox = get_icon("checked", "CheckBox"); checkbox = get_icon("GuiChecked", "EditorIcons");
else else
checkbox = get_icon("unchecked", "CheckBox"); checkbox = get_icon("GuiUnchecked", "EditorIcons");
Color color2(1, 1, 1); Color color2(1, 1, 1);
if (check_hover) { if (check_hover) {
@ -228,12 +230,11 @@ void EditorProperty::_notification(int p_what) {
draw_texture(checkbox, check_rect.position, color2); draw_texture(checkbox, check_rect.position, color2);
ofs += get_constant("hseparator", "Tree"); ofs += get_constant("hseparator", "Tree");
ofs += checkbox->get_width(); ofs += checkbox->get_width();
text_limit -= ofs;
} else { } else {
check_rect = Rect2(); check_rect = Rect2();
} }
int text_limit = text_size;
if (can_revert) { if (can_revert) {
Ref<Texture> reload_icon = get_icon("ReloadSmall", "EditorIcons"); Ref<Texture> reload_icon = get_icon("ReloadSmall", "EditorIcons");
text_limit -= reload_icon->get_width() + get_constant("hseparator", "Tree") * 2; text_limit -= reload_icon->get_width() + get_constant("hseparator", "Tree") * 2;