summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Hölzemer <rollenrolm@posteo.de>2016-08-04 16:43:55 +0200
committerRalf Hölzemer <rollenrolm@posteo.de>2016-09-09 20:16:13 +0200
commit991a433cb30c8f1ca085db655648b8971c61c9bf (patch)
tree30a7e76cd5f6165537efe82efd1830c528f10b05
parent8af99ef1c6499ff485e81b0859cf3b123661d4ab (diff)
Move hardcoded theme colors from editor_node into editor_themes
-rw-r--r--tools/editor/editor_node.cpp5
-rw-r--r--tools/editor/editor_themes.cpp5
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 8496530db3..11c51991e1 100644
--- a/tools/editor/editor_node.cpp
+++ b/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;
diff --git a/tools/editor/editor_themes.cpp b/tools/editor/editor_themes.cpp
index 44e21aee85..7130044490 100644
--- a/tools/editor/editor_themes.cpp
+++ b/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;
}