From 42eef3cdc65165af852dc256cabf2cadb2caf79e Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Sun, 6 Dec 2015 19:35:31 -0300
Subject: [PATCH] Better hidden folders display preferences for editor file
 dialogs

---
 demos/gui/input_mapping/controls.scn | Bin 2686 -> 2852 bytes
 scene/gui/file_dialog.cpp            |   2 +-
 tools/editor/editor_file_dialog.cpp  |  18 +++++++++++-------
 tools/editor/editor_node.cpp         |   1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/demos/gui/input_mapping/controls.scn b/demos/gui/input_mapping/controls.scn
index 276712ba2205efe1e3c9b04f52ba9d67e5d2ffbd..03567fb691c779a28c0392133ceab3c98a551c65 100644
GIT binary patch
literal 2852
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

literal 2686
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

diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 75a1cb92ee1..22e3a81e52d 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -623,7 +623,7 @@ void FileDialog::_update_drives() {
 	}
 }
 
-bool FileDialog::default_show_hidden_files=true;
+bool FileDialog::default_show_hidden_files=false;
 
 
 void FileDialog::_bind_methods() {
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index 66b38e2f0ca..104539c3089 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -34,8 +34,7 @@ void EditorFileDialog::_notification(int p_what) {
 		fav_down->set_icon(get_icon("MoveDown","EditorIcons"));
 		fav_rm->set_icon(get_icon("RemoveSmall","EditorIcons"));
 
-	}
-	if (p_what==NOTIFICATION_PROCESS) {
+	} else if (p_what==NOTIFICATION_PROCESS) {
 
 		if (preview_waiting) {
 			preview_wheel_timeout-=get_process_delta_time();
@@ -48,12 +47,17 @@ void EditorFileDialog::_notification(int p_what) {
 				preview_wheel_timeout=0.1;
 			}
 		}
-	}
-
-	if (p_what==NOTIFICATION_DRAW) {
+	} else if (p_what==NOTIFICATION_DRAW) {
 
 		//RID ci = get_canvas_item();
 		//get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size()));
+	} else if (p_what==EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
+
+		bool show_hidden = EditorSettings::get_singleton()->get("file_dialog/show_hidden_files");
+
+		if (show_hidden != show_hidden_files) {
+			set_show_hidden_files(show_hidden);
+		}
 	}
 }
 
@@ -1013,7 +1017,7 @@ void EditorFileDialog::_go_forward(){
 
 }
 
-bool EditorFileDialog::default_show_hidden_files=true;
+bool EditorFileDialog::default_show_hidden_files=false;
 
 void EditorFileDialog::set_display_mode(DisplayMode p_mode) {
 
@@ -1142,7 +1146,7 @@ void EditorFileDialog::_save_to_recent() {
 
 EditorFileDialog::EditorFileDialog() {
 
-	show_hidden_files=true;
+	show_hidden_files=default_show_hidden_files;
 	display_mode=DISPLAY_THUMBNAILS;
 	local_history_pos=0;
 
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 8b04e4f77e0..8e39ce36f80 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -4594,6 +4594,7 @@ EditorNode::EditorNode() {
 
 	ResourceLoader::set_abort_on_missing_resources(false);
 	FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
+	EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
 	ResourceLoader::set_error_notify_func(this,_load_error_notify);
 	ResourceLoader::set_dependency_error_notify_func(this,_dependency_error_report);