Revert "Add new editor and default theme (WIP)"

This reverts commit f045efe007.

editor/animation_editor.cpp

@@ -1035,7 +1035,7 @@ void AnimationKeyEditor::_track_pos_draw() {
 		//draw position
 		int pixel = (timeline_pos - h_scroll->get_value()) * zoom_scale;
 		pixel += name_limit;
-		track_pos->draw_line(ofs + Point2(pixel, 0), ofs + Point2(pixel, size.height), get_color("animation_editor_track_pos", "Editor"));
+		track_pos->draw_line(ofs + Point2(pixel, 0), ofs + Point2(pixel, size.height), Color(1, 0.3, 0.3, 0.8));
 	}
 }
 
@@ -1089,8 +1089,9 @@ void AnimationKeyEditor::_track_editor_draw() {
 	int sep = get_constant("vseparation", "Tree");
 	int hsep = get_constant("hseparation", "Tree");
 	Color color = get_color("font_color", "Tree");
-	Color sepcolor = get_color("guide_color", "Editor");
+	Color sepcolor = get_color("guide_color", "Tree");
-	Color timecolor = get_color("animation_editor_time", "Editor");
+	Color timecolor = get_color("prop_subsection", "Editor");
+	timecolor = Color::html("ff4a414f");
 	Color hover_color = Color(1, 1, 1, 0.05);
 	Color select_color = Color(1, 1, 1, 0.1);
 	Color invalid_path_color = Color(1, 0.6, 0.4, 0.5);
@@ -1154,9 +1155,8 @@ void AnimationKeyEditor::_track_editor_draw() {
 	int settings_limit = size.width - right_separator_ofs;
 	int name_limit = settings_limit * name_column_ratio;
 
-	Color line_color = get_color("animation_editor_line", "Editor");
+	te->draw_line(ofs + Point2(name_limit, 0), ofs + Point2(name_limit, size.height), color);
-	te->draw_line(ofs + Point2(name_limit, 0), ofs + Point2(name_limit, size.height), line_color);
+	te->draw_line(ofs + Point2(settings_limit, 0), ofs + Point2(settings_limit, size.height), color);
-	te->draw_line(ofs + Point2(settings_limit, 0), ofs + Point2(settings_limit, size.height), line_color);
 	te->draw_texture(hsize_icon, ofs + Point2(name_limit - hsize_icon->get_width() - hsep, (h - hsize_icon->get_height()) / 2));
 
 	te->draw_line(ofs + Point2(0, h), ofs + Point2(size.width, h), color);
@@ -1483,7 +1483,7 @@ void AnimationKeyEditor::_track_editor_draw() {
 	switch (click.click) {
 		case ClickOver::CLICK_SELECT_KEYS: {
 
-			te->draw_rect(Rect2(click.at, click.to - click.at), get_color("animation_editor_selection_rect", "Editor"));
+			te->draw_rect(Rect2(click.at, click.to - click.at), Color(0.7, 0.7, 1.0, 0.5));
 
 		} break;
 		case ClickOver::CLICK_MOVE_KEYS: {
@@ -3753,7 +3753,6 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	//add_child(menu);
 
 	zoomicon = memnew(TextureRect);
-	zoomicon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
 	hb->add_child(zoomicon);
 	zoomicon->set_tooltip(TTR("Animation zoom."));
 

editor/create_dialog.cpp

@@ -622,7 +622,6 @@ CreateDialog::CreateDialog() {
 	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	search_hb->add_child(search_box);
 	favorite = memnew(Button);
-	favorite->set_flat(true);
 	favorite->set_toggle_mode(true);
 	search_hb->add_child(favorite);
 	favorite->connect("pressed", this, "_favorite_toggled");

editor/editor_audio_buses.cpp

@@ -45,10 +45,6 @@ void EditorAudioBus::_notification(int p_what) {
 		vu_r->set_progress_texture(get_icon("BusVuFull", "EditorIcons"));
 		scale->set_texture(get_icon("BusVuDb", "EditorIcons"));
 
-		solo->set_icon(get_icon("AudioBusSolo", "EditorIcons"));
-		mute->set_icon(get_icon("AudioBusMute", "EditorIcons"));
-		bypass->set_icon(get_icon("AudioBusBypass", "EditorIcons"));
-
 		disabled_vu = get_icon("BusVuFrozen", "EditorIcons");
 
 		prev_active = true;
@@ -631,23 +627,23 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses) {
 	vb->add_child(hbc);
 	hbc->add_spacer();
 	solo = memnew(ToolButton);
-	solo->set_tooltip(TTR("Toggle Solo"));
+	solo->set_text("S");
 	solo->set_toggle_mode(true);
-	// solo->set_modulate(Color(0.8, 1.2, 0.8));
+	solo->set_modulate(Color(0.8, 1.2, 0.8));
 	solo->set_focus_mode(FOCUS_NONE);
 	solo->connect("pressed", this, "_solo_toggled");
 	hbc->add_child(solo);
 	mute = memnew(ToolButton);
-	mute->connect("pressed", this, "_mute_toggled");
+	mute->set_text("M");
 	mute->set_toggle_mode(true);
-	// mute->set_modulate(Color(1.2, 0.8, 0.8));
+	mute->set_modulate(Color(1.2, 0.8, 0.8));
 	mute->set_focus_mode(FOCUS_NONE);
-	mute->set_tooltip(TTR("Toggle Mute"));
+	mute->connect("pressed", this, "_mute_toggled");
 	hbc->add_child(mute);
 	bypass = memnew(ToolButton);
-	bypass->set_tooltip(TTR("Toggle Bypass"));
+	bypass->set_text("B");
 	bypass->set_toggle_mode(true);
-	// bypass->set_modulate(Color(1.1, 1.1, 0.8));
+	bypass->set_modulate(Color(1.1, 1.1, 0.8));
 	bypass->set_focus_mode(FOCUS_NONE);
 	bypass->connect("pressed", this, "_bypass_toggled");
 	hbc->add_child(bypass);
@@ -767,7 +763,7 @@ void EditorAudioBuses::_update_buses() {
 
 		EditorAudioBus *audio_bus = memnew(EditorAudioBus(this));
 		if (i == 0) {
-			audio_bus->set_self_modulate(Color(0.7, 0.7, 0.7));
+			audio_bus->set_self_modulate(Color(1, 0.9, 0.9));
 		}
 		bus_hb->add_child(audio_bus);
 		audio_bus->connect("delete_request", this, "_delete_bus", varray(audio_bus), CONNECT_DEFERRED);

editor/editor_node.cpp

@@ -2698,7 +2698,7 @@ void EditorNode::add_editor_plugin(EditorPlugin *p_editor) {
 		ToolButton *tb = memnew(ToolButton);
 		tb->set_toggle_mode(true);
 		tb->connect("pressed", singleton, "_editor_select", varray(singleton->main_editor_buttons.size()));
-		tb->set_icon(singleton->gui_base->get_icon(p_editor->get_name(), "EditorIcons"));
+		tb->set_text(p_editor->get_name());
 		singleton->main_editor_buttons.push_back(tb);
 		singleton->main_editor_button_vb->add_child(tb);
 		singleton->editor_table.push_back(p_editor);
@@ -5079,21 +5079,19 @@ EditorNode::EditorNode() {
 */
 	scene_tabs = memnew(Tabs);
 	scene_tabs->add_tab("unsaved");
-	scene_tabs->set_tab_align(Tabs::ALIGN_LEFT);
+	scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
 	scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("interface/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY));
 	scene_tabs->connect("tab_changed", this, "_scene_tab_changed");
 	scene_tabs->connect("right_button_pressed", this, "_scene_tab_script_edited");
 	scene_tabs->connect("tab_close", this, "_scene_tab_closed");
 
-	// MarginContainer *st_mc = memnew( MarginContainer );
-	// st_mc->add_child(scene_tabs);
 	srt->add_child(scene_tabs);
 
 	scene_root_parent = memnew(PanelContainer);
 	scene_root_parent->set_custom_minimum_size(Size2(0, 80) * EDSCALE);
 	scene_root_parent->add_style_override("panel", gui_base->get_stylebox("EditorPanel", "EditorStyles"));
 
-	// Ref<StyleBox> sp = scene_root_parent->get_stylebox("panel_full","PanelContainer");
+	//Ref<StyleBox> sp = scene_root_parent->get_stylebox("panel","TabContainer");
 	//scene_root_parent->add_style_override("panel",sp);
 
 	/*scene_root_parent->set_anchor( MARGIN_RIGHT, Control::ANCHOR_END );
@@ -5124,7 +5122,7 @@ EditorNode::EditorNode() {
 	scene_root_parent->add_child(viewport);
 
 	PanelContainer *top_region = memnew(PanelContainer);
-	top_region->add_style_override("panel", memnew(StyleBoxEmpty));
+	top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
 	HBoxContainer *left_menu_hb = memnew(HBoxContainer);
 	top_region->add_child(left_menu_hb);
 	menu_hb->add_child(top_region);
@@ -5207,7 +5205,7 @@ EditorNode::EditorNode() {
 	}
 
 	PanelContainer *editor_region = memnew(PanelContainer);
-	editor_region->add_style_override("panel", memnew(StyleBoxEmpty));
+	editor_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
 	main_editor_button_vb = memnew(HBoxContainer);
 	editor_region->add_child(main_editor_button_vb);
 	menu_hb->add_child(editor_region);
@@ -5274,8 +5272,6 @@ EditorNode::EditorNode() {
 	//s1->set_size(Point2(10,15));
 
 	play_cc = memnew(CenterContainer);
-	// play_cc->add_style_override("bg",gui_base->get_stylebox("panel","PanelContainer"));
-
 	play_cc->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
 	gui_base->add_child(play_cc);
 	play_cc->set_area_as_parent_rect();
@@ -5283,7 +5279,7 @@ EditorNode::EditorNode() {
 	play_cc->set_margin(MARGIN_TOP, 5);
 
 	top_region = memnew(PanelContainer);
-	top_region->add_style_override("panel", gui_base->get_stylebox("panel", "ButtonGroup"));
+	top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
 	play_cc->add_child(top_region);
 
 	HBoxContainer *play_hb = memnew(HBoxContainer);
@@ -5403,9 +5399,7 @@ EditorNode::EditorNode() {
 	}
 
 	PanelContainer *vu_cont = memnew(PanelContainer);
-	vu_cont->add_style_override("panel", memnew(StyleBoxEmpty));
+	vu_cont->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
-
-	// CenterContainer *vu_cont = memnew( CenterContainer );
 	menu_hb->add_child(vu_cont);
 
 	audio_vu = memnew(TextureProgress);
@@ -5426,7 +5420,7 @@ EditorNode::EditorNode() {
 	}
 
 	top_region = memnew(PanelContainer);
-	top_region->add_style_override("panel", memnew(StyleBoxEmpty));
+	top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button"));
 	HBoxContainer *right_menu_hb = memnew(HBoxContainer);
 	top_region->add_child(right_menu_hb);
 	menu_hb->add_child(top_region);
@@ -5592,7 +5586,7 @@ EditorNode::EditorNode() {
 	search_button = memnew(ToolButton);
 	search_button->set_toggle_mode(true);
 	search_button->set_pressed(false);
-	search_button->set_icon(gui_base->get_icon("Search", "EditorIcons"));
+	search_button->set_icon(gui_base->get_icon("Zoom", "EditorIcons"));
 	prop_editor_hb->add_child(search_button);
 	search_button->connect("toggled", this, "_toggle_search_bar");
 

editor/editor_settings.cpp

@@ -568,7 +568,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 
 	set("editors/grid_map/pick_distance", 5000.0);
 
-	set("editors/3d/grid_color", Color(1, 1, 1, 0.2));
+	set("editors/3d/grid_color", Color(0, 1, 0, 0.2));
 	hints["editors/3d/grid_color"] = PropertyInfo(Variant::COLOR, "editors/3d/grid_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED);
 
 	set("editors/3d/default_fov", 45.0);

editor/editor_themes.cpp

@@ -49,85 +49,11 @@ Ref<Theme> create_editor_theme() {
 	}
 	focus_sbt->set_draw_center(false);
 	theme->set_stylebox("EditorFocus", "EditorStyles", focus_sbt);
-
+	theme->set_color("prop_category", "Editor", Color::hex(0x3f3a44ff));
-	Ref<StyleBoxFlat> style_panel(memnew(StyleBoxFlat));
+	theme->set_color("prop_section", "Editor", Color::hex(0x35313aff));
-	style_panel->set_bg_color(Color::html("#36424e"));
+	theme->set_color("prop_subsection", "Editor", Color::hex(0x312e37ff));
-	style_panel->set_default_margin(MARGIN_LEFT, 1);
+	theme->set_color("fg_selected", "Editor", Color::html("ffbd8e8e"));
-	style_panel->set_default_margin(MARGIN_RIGHT, 1);
+	theme->set_color("fg_error", "Editor", Color::html("ffbd8e8e"));
-	style_panel->set_default_margin(MARGIN_BOTTOM, 1);
-	style_panel->set_default_margin(MARGIN_TOP, 4 * EDSCALE);
-	theme->set_stylebox("panel", "TabContainer", style_panel);
-	theme->set_stylebox("EditorPanel", "EditorStyles", style_panel);
-
-	Ref<StyleBoxFlat> style_bg(memnew(StyleBoxFlat));
-	style_bg->set_bg_color(Color::html("#2b353f"));
-	style_bg->set_default_margin(MARGIN_LEFT, 0);
-	style_bg->set_default_margin(MARGIN_RIGHT, 0);
-	style_bg->set_default_margin(MARGIN_BOTTOM, 0);
-	style_bg->set_default_margin(MARGIN_TOP, 0);
-	theme->set_stylebox("bg", "Tree", style_bg);
-	theme->set_stylebox("bg", "ItemList", style_bg);
-	theme->set_stylebox("EditorBG", "EditorStyles", style_bg);
-
-	Ref<StyleBox> style_tree_btn = theme->get_stylebox("button_pressed", "Tree");
-	style_tree_btn->set_default_margin(MARGIN_LEFT, 3 * EDSCALE);
-	style_tree_btn->set_default_margin(MARGIN_RIGHT, 3 * EDSCALE);
-	theme->set_stylebox("button_pressed", "Tree", style_tree_btn);
-
-	Ref<StyleBoxFlat> style_tab(memnew(StyleBoxFlat));
-	style_tab->set_default_margin(MARGIN_LEFT, 15 * EDSCALE);
-	style_tab->set_default_margin(MARGIN_RIGHT, 15 * EDSCALE);
-	style_tab->set_default_margin(MARGIN_BOTTOM, 5 * EDSCALE);
-	style_tab->set_default_margin(MARGIN_TOP, 5 * EDSCALE);
-
-	Ref<StyleBoxFlat> style_tab_fg = style_tab->duplicate();
-	style_tab_fg->set_bg_color(Color::html("#36424e"));
-
-	Ref<StyleBoxFlat> style_tab_bg = style_tab->duplicate();
-	style_tab_bg->set_draw_center(false);
-
-	theme->set_stylebox("tab_fg", "TabContainer", style_tab_fg);
-	theme->set_stylebox("tab_bg", "TabContainer", style_tab_bg);
-	theme->set_stylebox("tab_fg", "Tabs", style_tab_fg);
-	theme->set_stylebox("tab_bg", "Tabs", style_tab_bg);
-
-	Ref<StyleBoxFlat> style_panel_debugger(memnew(StyleBoxFlat));
-	style_panel_debugger->set_bg_color(Color::html("#3e4c5a"));
-	style_panel_debugger->set_default_margin(MARGIN_LEFT, 0);
-	style_panel_debugger->set_default_margin(MARGIN_RIGHT, 0);
-	style_panel_debugger->set_default_margin(MARGIN_BOTTOM, 0);
-	style_panel_debugger->set_default_margin(MARGIN_TOP, 4 * EDSCALE);
-	theme->set_stylebox("EditorPanelDebugger", "EditorStyles", style_panel_debugger);
-
-	Ref<StyleBoxFlat> style_tab_fg_debugger = style_tab->duplicate();
-	style_tab_fg_debugger->set_bg_color(Color::html("#3e4c5a"));
-	style_tab_fg_debugger->set_default_margin(MARGIN_LEFT, 10 * EDSCALE);
-	style_tab_fg_debugger->set_default_margin(MARGIN_RIGHT, 10 * EDSCALE);
-	Ref<StyleBoxFlat> style_tab_bg_debugger = style_tab->duplicate();
-	style_tab_bg_debugger->set_draw_center(false);
-	style_tab_bg_debugger->set_default_margin(MARGIN_LEFT, 10 * EDSCALE);
-	style_tab_bg_debugger->set_default_margin(MARGIN_RIGHT, 10 * EDSCALE);
-
-	theme->set_stylebox("EditorTabFGDebugger", "EditorStyles", style_tab_fg_debugger);
-	theme->set_stylebox("EditorTabBGDebugger", "EditorStyles", style_tab_bg_debugger);
-
-	Ref<StyleBoxFlat> style_textedit_normal(memnew(StyleBoxFlat));
-	style_textedit_normal->set_bg_color(Color::html("#29343d"));
-	style_textedit_normal->set_default_margin(MARGIN_LEFT, 0);
-	style_textedit_normal->set_default_margin(MARGIN_RIGHT, 0);
-	style_textedit_normal->set_default_margin(MARGIN_BOTTOM, 0);
-	style_textedit_normal->set_default_margin(MARGIN_TOP, 0);
-	theme->set_stylebox("normal", "TextEdit", style_textedit_normal);
-
-	theme->set_constant("separation", "HSplitContainer", 8 * EDSCALE);
-	theme->set_constant("separation", "VSplitContainer", 8 * EDSCALE);
-	theme->set_constant("side_margin", "TabContainer", 0);
-
-	// 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;
 }

editor/filesystem_dock.cpp

@@ -150,11 +150,10 @@ void FileSystemDock::_notification(int p_what) {
 			}
 			button_display_mode->connect("pressed", this, "_change_file_display");
 			//file_options->set_icon( get_icon("Tools","EditorIcons"));
-
 			files->connect("item_activated", this, "_select_file");
 			button_hist_next->connect("pressed", this, "_fw_history");
 			button_hist_prev->connect("pressed", this, "_bw_history");
-			search_icon->set_texture(get_icon("Search", "EditorIcons"));
+			search_icon->set_texture(get_icon("Zoom", "EditorIcons"));
 
 			button_hist_next->set_icon(get_icon("Forward", "EditorIcons"));
 			button_hist_prev->set_icon(get_icon("Back", "EditorIcons"));
@@ -1668,6 +1667,8 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	button_reload->set_tooltip(TTR("Re-Scan Filesystem"));
 	button_reload->hide();
 
+	//toolbar_hbc->add_spacer();
+
 	button_favorite = memnew(Button);
 	button_favorite->set_flat(true);
 	button_favorite->set_toggle_mode(true);