Remove remaining style hacks

Author: lodetrick

editor/editor_node.cpp

@@ -666,6 +666,7 @@ void EditorNode::_update_theme(bool p_skip_creation) {
 		}
 
 		editor_main_screen->add_theme_style_override(SceneStringName(panel), theme->get_stylebox(SNAME("Content"), EditorStringName(EditorStyles)));
+		bottom_panel->_theme_changed();
 		distraction_free->set_button_icon(theme->get_icon(SNAME("DistractionFree"), EditorStringName(EditorIcons)));
 		distraction_free->add_theme_style_override(SceneStringName(pressed), theme->get_stylebox(CoreStringName(normal), "FlatMenuButton"));
 

editor/gui/editor_bottom_panel.cpp

@@ -42,11 +42,6 @@
 #include "scene/gui/button.h"
 #include "scene/gui/split_container.h"
 
-void EditorBottomPanel::_update_margins() {
-	TabContainer::_update_margins();
-	get_tab_bar()->set_offset(SIDE_RIGHT, get_tab_bar()->get_offset(SIDE_RIGHT) - bottom_hbox->get_size().x);
-}
-
 void EditorBottomPanel::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
@@ -60,8 +55,25 @@ void EditorBottomPanel::_on_tab_changed(int p_idx) {
 	callable_mp(this, &EditorBottomPanel::_repaint).call_deferred();
 }
 
+void EditorBottomPanel::_theme_changed() {
+	Ref<StyleBox> bottom_tabbar_style = get_theme_stylebox("tabbar_background", "BottomPanel")->duplicate();
+	bottom_tabbar_style->set_content_margin(SIDE_RIGHT, bottom_hbox->get_minimum_size().x + bottom_tabbar_style->get_content_margin(SIDE_LEFT));
+	add_theme_style_override("tabbar_background", bottom_tabbar_style);
+
+	if (get_current_tab() == -1) {
+		// Hide panel when not showing anything.
+		remove_theme_style_override(SceneStringName(panel));
+	} else {
+		add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles)));
+	}
+}
+
 void EditorBottomPanel::_repaint() {
 	bool panel_collapsed = get_current_tab() == -1;
+	if (panel_collapsed == (get_previous_tab() == -1)) {
+		return;
+	}
+
 	SplitContainer *center_split = Object::cast_to<SplitContainer>(get_parent());
 	ERR_FAIL_NULL(center_split);
 
@@ -74,12 +86,7 @@ void EditorBottomPanel::_repaint() {
 		EditorNode::get_top_split()->set_visible(panel_collapsed);
 	}
 
-	if (panel_collapsed) {
-		// Hide panel when not showing anything.
-		remove_theme_style_override(SceneStringName(panel));
-	} else {
-		add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles)));
-	}
+	_theme_changed();
 }
 
 void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const {
@@ -194,7 +201,6 @@ void EditorBottomPanel::_on_button_visibility_changed(Button *p_button, Control
 EditorBottomPanel::EditorBottomPanel() {
 	get_tab_bar()->connect(SceneStringName(gui_input), callable_mp(EditorDockManager::get_singleton(), &EditorDockManager::_dock_container_gui_input).bind(this));
 	get_tab_bar()->connect("tab_changed", callable_mp(this, &EditorBottomPanel::_on_tab_changed));
-	set_custom_minimum_size(Size2(400 * EDSCALE, 0));
 	set_tabs_position(TabPosition::POSITION_BOTTOM);
 	set_deselect_enabled(true);
 

editor/gui/editor_bottom_panel.h

@@ -60,7 +60,6 @@ class EditorBottomPanel : public TabContainer {
 protected:
 	void _notification(int p_what);
 
-	virtual void _update_margins() override;
 	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
 
 public:
@@ -74,6 +73,7 @@ class EditorBottomPanel : public TabContainer {
 	void hide_bottom_panel();
 	void toggle_last_opened_bottom_panel();
 	void set_expanded(bool p_expanded);
+	void _theme_changed();
 
 	EditorBottomPanel();
 	~EditorBottomPanel();

editor/themes/editor_theme_manager.cpp

@@ -1971,7 +1971,7 @@ void EditorThemeManager::_populate_editor_styles(const Ref<EditorTheme> &p_theme
 
 		// Bottom panel.
 		Ref<StyleBoxFlat> style_bottom_panel = p_config.content_panel_style->duplicate();
-		style_bottom_panel->set_border_width_all(0);
+		style_bottom_panel->set_border_width(SIDE_BOTTOM, 0);
 		style_bottom_panel->set_corner_radius_all(p_config.corner_radius * EDSCALE);
 		style_bottom_panel->set_corner_radius(CORNER_BOTTOM_LEFT, 0);
 		style_bottom_panel->set_corner_radius(CORNER_BOTTOM_RIGHT, 0);

scene/gui/tab_container.h

@@ -106,6 +106,7 @@ class TabContainer : public Container {
 	void _repaint();
 	void _refresh_tab_indices();
 	void _refresh_tab_names();
+	void _update_margins();
 	void _on_mouse_exited();
 	void _on_tab_changed(int p_tab);
 	void _on_tab_clicked(int p_tab);
@@ -130,8 +131,6 @@ class TabContainer : public Container {
 	virtual void remove_child_notify(Node *p_child) override;
 	static void _bind_methods();
 
-	virtual void _update_margins();
-
 public:
 	virtual bool accessibility_override_tree_hierarchy() const override { return true; }