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

Merge pull request #24085 from guilhermefelipecgs/fix_layout

Browse source 
Fix key icon overlapping revert icon
This commit is contained in:
Rémi Verschelde 2018-12-02 18:09:34 +01:00 committed by GitHub
commit f730d183c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editor/editor_inspector.cpp
View file

@ -128,18 +128,22 @@ void EditorProperty::_notification(int p_what) {
bottom_rect = Rect2(m, rect.size.height + get_constant("vseparation", "Tree"), size.width - m, bottom_editor->get_combined_minimum_size().height);
}
}
if (keying) {
Ref<Texture> key;
if (keying) {
Ref<Texture> key;
if (use_keying_next()) {
key = get_icon("KeyNext", "EditorIcons");
} else {
key = get_icon("Key", "EditorIcons");
if (use_keying_next()) {
key = get_icon("KeyNext", "EditorIcons");
} else {
key = get_icon("Key", "EditorIcons");
}
rect.size.x -= key->get_width() + get_constant("hseparator", "Tree");
if (no_children) {
text_size -= key->get_width() + 4 * EDSCALE;
}
}
rect.size.x -= key->get_width() + get_constant("hseparator", "Tree");
}
//set children