asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #28321 from jbuck3/checkable-property-fix

Browse source 
Fix drawing of checkable editor properties
This commit is contained in:
Rémi Verschelde 2019-04-23 12:05:22 +02:00 committed by GitHub
commit baad657091
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 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;