godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #49178 from YeldhamDev/remove_dim_option

Browse Source
This commit is contained in:
Rémi Verschelde
2021-05-31 12:27:01 +02:00
committed by GitHub
parent 4e3d5148ff 38e635bb1d
commit f0aa4e597a
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor/editor_node.cpp
View File

@@ -2893,7 +2893,7 @@ void EditorNode::_exit_editor() {
_save_docks(); _save_docks();
// Dim the editor window while it's quitting to make it clearer that it's busy // 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(); get_tree()->quit();
} }
@@ -5405,15 +5405,9 @@ void EditorNode::_open_imported() {
load_scene(open_import_request, true, false, true, true); load_scene(open_import_request, true, false, true, true);
} }
void EditorNode::dim_editor(bool p_dimming, bool p_force_dim) { void EditorNode::dim_editor(bool p_dimming) {
// Dimming can be forced regardless of the editor setting, which is useful when quitting the editor. dimmed = p_dimming;
if ((p_force_dim || EditorSettings::get_singleton()->get("interface/editor/dim_editor_on_dialog_popup")) && p_dimming) { gui_base->set_modulate(p_dimming ? Color(0.5, 0.5, 0.5) : Color(1, 1, 1));
dimmed = true;
gui_base->set_modulate(Color(0.5, 0.5, 0.5));
} else {
dimmed = false;
gui_base->set_modulate(Color(1, 1, 1));
}
} }
bool EditorNode::is_editor_dimmed() const { bool EditorNode::is_editor_dimmed() const {

2
editor/editor_node.h
View File

@@ -856,7 +856,7 @@ public:
void notify_settings_changed(); 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; bool is_editor_dimmed() const;
void edit_current() { _edit_current(); }; void edit_current() { _edit_current(); };

1
editor/editor_settings.cpp
View File

@@ -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); 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", ""); _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); 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 _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); 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 _initial_set("interface/editor/unfocused_low_processor_mode_sleep_usec", 50000); // 20 FPS