diff --git a/src/ui_parts/settings_menu.gd b/src/ui_parts/settings_menu.gd index 80e4f12..e0d2bda 100644 --- a/src/ui_parts/settings_menu.gd +++ b/src/ui_parts/settings_menu.gd @@ -81,7 +81,7 @@ func setup_tabs() -> void: tab.toggle_mode = true tab.action_mode = BaseButton.ACTION_MODE_BUTTON_PRESS tab.focus_mode = Control.FOCUS_NONE - tab.theme_type_variation = "SideTab" + tab.theme_type_variation = "TabButton" tab.toggled.connect(_on_tab_toggled.bind(tab_index)) tab.button_group = button_group tab.button_pressed = (tab_index == focused_tab_index) diff --git a/src/ui_parts/settings_menu.tscn b/src/ui_parts/settings_menu.tscn index b4260fd..ef7262b 100644 --- a/src/ui_parts/settings_menu.tscn +++ b/src/ui_parts/settings_menu.tscn @@ -17,7 +17,6 @@ script = ExtResource("1_1gf4m") [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 2 -theme_override_constants/separation = 8 [node name="PanelContainer" type="PanelContainer" parent="VBoxContainer"] layout_mode = 2 @@ -35,6 +34,10 @@ focus_mode = 0 mouse_default_cursor_shape = 2 icon = ExtResource("2_ndyp7") +[node name="spacer" type="Control" parent="VBoxContainer"] +custom_minimum_size = Vector2(0, 8) +layout_mode = 2 + [node name="BoxContainer" type="BoxContainer" parent="VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 @@ -44,7 +47,7 @@ vertical = true custom_minimum_size = Vector2(120, 0) layout_mode = 2 size_flags_horizontal = 0 -theme_override_constants/separation = 8 +theme_override_constants/separation = 0 [node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/BoxContainer"] layout_mode = 2 diff --git a/src/utils/ThemeUtils.gd b/src/utils/ThemeUtils.gd index 2740cf7..db16fe7 100644 --- a/src/utils/ThemeUtils.gd +++ b/src/utils/ThemeUtils.gd @@ -785,28 +785,26 @@ static func _setup_button(theme: Theme) -> void: theme.set_stylebox("hover_pressed", "TextButton", text_button_empty_stylebox) theme.set_stylebox("disabled", "TextButton", text_button_empty_stylebox) - theme.add_type("SideTab") - theme.set_type_variation("SideTab", "Button") - - var normal_sidetab_stylebox := StyleBoxFlat.new() - normal_sidetab_stylebox.draw_center = false - normal_sidetab_stylebox.content_margin_left = 6.0 - normal_sidetab_stylebox.content_margin_right = 6.0 - normal_sidetab_stylebox.content_margin_bottom = 3.0 - normal_sidetab_stylebox.content_margin_top = 3.0 - theme.set_stylebox("normal", "SideTab", normal_sidetab_stylebox) - - var hovered_sidetab_stylebox := normal_sidetab_stylebox.duplicate() - hovered_sidetab_stylebox.bg_color = softer_intermediate_hover_color - hovered_sidetab_stylebox.draw_center = true - theme.set_stylebox("hover", "SideTab", hovered_sidetab_stylebox) - - var pressed_sidetab_stylebox := normal_sidetab_stylebox.duplicate() - pressed_sidetab_stylebox.bg_color = selected_tab_color - pressed_sidetab_stylebox.border_color = selected_tab_border_color - pressed_sidetab_stylebox.border_width_bottom = 2 - theme.set_stylebox("pressed", "SideTab", pressed_sidetab_stylebox) - theme.set_stylebox("hover_pressed", "SideTab", pressed_sidetab_stylebox) + theme.add_type("TabButton") + theme.set_type_variation("TabButton", "Button") + + var normal_tab_stylebox := StyleBoxFlat.new() + normal_tab_stylebox.draw_center = false + normal_tab_stylebox.set_content_margin_all(8) + theme.set_stylebox("normal", "TabButton", normal_tab_stylebox) + + var hovered_tab_stylebox := normal_tab_stylebox.duplicate() + hovered_tab_stylebox.bg_color = softer_intermediate_hover_color + hovered_tab_stylebox.draw_center = true + theme.set_stylebox("hover", "TabButton", hovered_tab_stylebox) + + var pressed_tab_stylebox := normal_tab_stylebox.duplicate() + pressed_tab_stylebox.draw_center = true + pressed_tab_stylebox.bg_color = selected_tab_color + pressed_tab_stylebox.border_color = selected_tab_border_color + pressed_tab_stylebox.border_width_bottom = 2 + theme.set_stylebox("pressed", "TabButton", pressed_tab_stylebox) + theme.set_stylebox("hover_pressed", "TabButton", pressed_tab_stylebox) theme.add_type("Swatch") theme.set_type_variation("Swatch", "Button")