summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorJames Buck <jamesbuck11@gmail.com>2019-04-22 20:33:53 -0500
committerJames Buck <jamesbuck11@gmail.com>2019-04-22 20:38:17 -0500
commitc230c6db98e98c3a473e13d6116481fef9fa4ac1 (patch)
treef8ef9ee76be73b13b31c15893ed1b2a00c8fb028 /editor
parent33a0011ab292214cee81363bbb50d9de123af825 (diff)
Fix drawing of checkable editor properties
- Make text cutoff respect checkbox icon's width - Get checkbox icon from EditorIcons instead of CheckBox
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_inspector.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index f1f68a14de..f7527763eb 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -211,12 +211,14 @@ void EditorProperty::_notification(int p_what) {
}
int ofs = 0;
+ int text_limit = text_size;
+
if (checkable) {
Ref<Texture> checkbox;
if (checked)
- checkbox = get_icon("checked", "CheckBox");
+ checkbox = get_icon("GuiChecked", "EditorIcons");
else
- checkbox = get_icon("unchecked", "CheckBox");
+ checkbox = get_icon("GuiUnchecked", "EditorIcons");
Color color2(1, 1, 1);
if (check_hover) {
@@ -228,12 +230,11 @@ void EditorProperty::_notification(int p_what) {
draw_texture(checkbox, check_rect.position, color2);
ofs += get_constant("hseparator", "Tree");
ofs += checkbox->get_width();
+ text_limit -= ofs;
} else {
check_rect = Rect2();
}
- int text_limit = text_size;
-
if (can_revert) {
Ref<Texture> reload_icon = get_icon("ReloadSmall", "EditorIcons");
text_limit -= reload_icon->get_width() + get_constant("hseparator", "Tree") * 2;