Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fix editor remaining dimmed after certain actions 

Fixes #30368
3.2
Bojidar Marinov 2019-07-06 17:37:40 +07:00
parent 0b6b49a897
commit e222615e97
No known key found for this signature in database
GPG Key ID: 4D546A8F1E091856
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/editor_node.cpp
Unescape Escape View File

@ -4967,18 +4967,18 @@ void EditorNode::dim_editor(bool p_dimming) {
static int dim_count = 0;
bool dim_ui = EditorSettings::get_singleton()->get("interface/editor/dim_editor_on_dialog_popup");
if (p_dimming) {
if (dim_ui) {
if (dim_count == 0) {
_start_dimming(true);
}
dim_count++;
if (dim_ui && dim_count == 0) {
_start_dimming(true);
}
dim_count++;
} else {
if (dim_count == 1) {
_start_dimming(false);
dim_count = 0;
} else if (dim_ui && dim_count > 0) {
}
if (dim_count > 0) {
dim_count--;
} else {
ERR_PRINT("Undimmed before dimming!");
}
}
}

8
scene/gui/popup.cpp
Unescape Escape View File

@ -48,6 +48,14 @@ void Popup::_notification(int p_what) {
update_configuration_warning();
}
if (p_what == NOTIFICATION_EXIT_TREE) {
if (popped_up) {
popped_up = false;
notification(NOTIFICATION_POPUP_HIDE);
emit_signal("popup_hide");
}
}
if (p_what == NOTIFICATION_ENTER_TREE) {
//small helper to make editing of these easier in editor
#ifdef TOOLS_ENABLED