Browse Source

Merge pull request #5892 from rollenrolm/pr-hardcoded-colors

 Move hardcoded theme colors from editor_node into editor_themes
Rémi Verschelde 9 years ago
parent
commit
97cebe1358
2 changed files with 5 additions and 5 deletions
  1. 0 5
      tools/editor/editor_node.cpp
  2. 5 0
      tools/editor/editor_themes.cpp

+ 0 - 5
tools/editor/editor_node.cpp

@@ -6543,11 +6543,6 @@ EditorNode::EditorNode() {
 
 	Globals::get_singleton()->set("debug/indicators_enabled",true);
 	Globals::get_singleton()->set("render/room_cull_enabled",false);
-	theme->set_color("prop_category","Editor",Color::hex(0x3f3a44ff));
-	theme->set_color("prop_section","Editor",Color::hex(0x35313aff));
-	theme->set_color("prop_subsection","Editor",Color::hex(0x312e37ff));
-	theme->set_color("fg_selected","Editor",Color::html("ffbd8e8e"));
-	theme->set_color("fg_error","Editor",Color::html("ffbd8e8e"));
 
 	reference_resource_mem=true;
 	save_external_resources_mem=true;

+ 5 - 0
tools/editor/editor_themes.cpp

@@ -48,6 +48,11 @@ Ref<Theme> create_default_theme()
 	}
 	focus_sbt->set_draw_center(false);
 	theme->set_stylebox("EditorFocus","EditorStyles",focus_sbt);
+	theme->set_color("prop_category","Editor",Color::hex(0x3f3a44ff));
+	theme->set_color("prop_section","Editor",Color::hex(0x35313aff));
+	theme->set_color("prop_subsection","Editor",Color::hex(0x312e37ff));
+	theme->set_color("fg_selected","Editor",Color::html("ffbd8e8e"));
+	theme->set_color("fg_error","Editor",Color::html("ffbd8e8e"));
 
 	return theme;
 }