diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-31 12:27:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 12:27:01 +0200 |
| commit | f0aa4e597ab0acc9d4ba124cdbcf6ab1fa1e544c (patch) | |
| tree | 6f3f6307c539bcea53071ad13e6adb2900035528 | |
| parent | 4e3d5148ff8a26b96b2ebc035ff46753f6704dd8 (diff) | |
| parent | 38e635bb1d72b66b75a2a3da60978da8bb121019 (diff) | |
Merge pull request #49178 from YeldhamDev/remove_dim_option
| -rw-r--r-- | editor/editor_node.cpp | 14 | ||||
| -rw-r--r-- | editor/editor_node.h | 2 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 1 |
3 files changed, 5 insertions, 12 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index e433ddc6f5..aa632b90ad 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2893,7 +2893,7 @@ void EditorNode::_exit_editor() { _save_docks(); // Dim the editor window while it's quitting to make it clearer that it's busy - dim_editor(true, true); + dim_editor(true); get_tree()->quit(); } @@ -5405,15 +5405,9 @@ void EditorNode::_open_imported() { load_scene(open_import_request, true, false, true, true); } -void EditorNode::dim_editor(bool p_dimming, bool p_force_dim) { - // Dimming can be forced regardless of the editor setting, which is useful when quitting the editor. - if ((p_force_dim || EditorSettings::get_singleton()->get("interface/editor/dim_editor_on_dialog_popup")) && p_dimming) { - dimmed = true; - gui_base->set_modulate(Color(0.5, 0.5, 0.5)); - } else { - dimmed = false; - gui_base->set_modulate(Color(1, 1, 1)); - } +void EditorNode::dim_editor(bool p_dimming) { + dimmed = p_dimming; + gui_base->set_modulate(p_dimming ? Color(0.5, 0.5, 0.5) : Color(1, 1, 1)); } bool EditorNode::is_editor_dimmed() const { diff --git a/editor/editor_node.h b/editor/editor_node.h index 0680cc85c7..9625b318e0 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -856,7 +856,7 @@ public: void notify_settings_changed(); - void dim_editor(bool p_dimming, bool p_force_dim = false); + void dim_editor(bool p_dimming); bool is_editor_dimmed() const; void edit_current() { _edit_current(); }; diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 4e4849871b..28b01c0d18 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -419,7 +419,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { hints["interface/editor/main_font_bold"] = PropertyInfo(Variant::STRING, "interface/editor/main_font_bold", PROPERTY_HINT_GLOBAL_FILE, "*.ttf,*.otf", PROPERTY_USAGE_DEFAULT); _initial_set("interface/editor/code_font", ""); hints["interface/editor/code_font"] = PropertyInfo(Variant::STRING, "interface/editor/code_font", PROPERTY_HINT_GLOBAL_FILE, "*.ttf,*.otf", PROPERTY_USAGE_DEFAULT); - _initial_set("interface/editor/dim_editor_on_dialog_popup", true); _initial_set("interface/editor/low_processor_mode_sleep_usec", 6900); // ~144 FPS hints["interface/editor/low_processor_mode_sleep_usec"] = PropertyInfo(Variant::FLOAT, "interface/editor/low_processor_mode_sleep_usec", PROPERTY_HINT_RANGE, "1,100000,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); _initial_set("interface/editor/unfocused_low_processor_mode_sleep_usec", 50000); // 20 FPS |