Theme edits (#342)

* Theme edits

Changed all the themes to be more consistent, buttons and panel containers have rounded edges. Note that the spacings have been switched too, so it needs subtle remakes in the placing of each element. Especially the tool buttons. Also check the themes on preferences (need better spacing) and rulers are not included.

* Some UI fixes

* Reduced size of themes

* Fixed more spacing issues and replaced timeline grabber icon

* Removed old theme icons

* Change purple and light rulers

* Fix purple top menu & caramel rulers

Co-authored-by: Erevoid <Erevoid@users.noreply.github.com>
Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>

assets/themes/dark/icons/grabber.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/grabber.png-81d4e5de8b8d25ef28043e12477a5047.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/dark/icons/grabber.png"
-dest_files=[ "res://.import/grabber.png-81d4e5de8b8d25ef28043e12477a5047.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/dark/icons/grabber_hover.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/grabber_hover.png-6e0d9c77ceadc2d1632c9a85a7911876.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/dark/icons/grabber_hover.png"
-dest_files=[ "res://.import/grabber_hover.png-6e0d9c77ceadc2d1632c9a85a7911876.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/dark/icons/hsplit.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/hsplit.png-a437d5e2d0493714b9a4bb4e31df7099.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/dark/icons/hsplit.png"
-dest_files=[ "res://.import/hsplit.png-a437d5e2d0493714b9a4bb4e31df7099.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/dark/icons/spinbox.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/spinbox.png-db435fcd46b95ff41e6b2b17aece2be9.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/dark/icons/spinbox.png"
-dest_files=[ "res://.import/spinbox.png-db435fcd46b95ff41e6b2b17aece2be9.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/dark/icons/vsplit.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/vsplit.png-3c495e075085fe8f9088eedeae9fcbcb.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/dark/icons/vsplit.png"
-dest_files=[ "res://.import/vsplit.png-3c495e075085fe8f9088eedeae9fcbcb.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/light/icons/grabber.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/grabber.png-61927377c05a6faab6f5ad8d64517a4e.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/light/icons/grabber.png"
-dest_files=[ "res://.import/grabber.png-61927377c05a6faab6f5ad8d64517a4e.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/light/icons/grabber_hover.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/grabber_hover.png-50ed6eb83ae0f5e6818d3317f3ea7425.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/light/icons/grabber_hover.png"
-dest_files=[ "res://.import/grabber_hover.png-50ed6eb83ae0f5e6818d3317f3ea7425.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/light/icons/hsplit.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/hsplit.png-cff421f387a40a015e4864c4aad31efb.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/light/icons/hsplit.png"
-dest_files=[ "res://.import/hsplit.png-cff421f387a40a015e4864c4aad31efb.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/light/icons/spinbox.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/spinbox.png-d344968329ae29b64e56a477dcbd82f4.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/light/icons/spinbox.png"
-dest_files=[ "res://.import/spinbox.png-d344968329ae29b64e56a477dcbd82f4.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/themes/light/icons/vsplit.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/vsplit.png-42d8c8f71ee9dacedb0f21c441def848.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/themes/light/icons/vsplit.png"
-dest_files=[ "res://.import/vsplit.png-42d8c8f71ee9dacedb0f21c441def848.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

src/Preferences/HandleThemes.gd

@@ -7,9 +7,10 @@ onready var themes := [
 	[preload("res://assets/themes/blue/theme.tres"), "Blue"],
 	[preload("res://assets/themes/caramel/theme.tres"), "Caramel"],
 	[preload("res://assets/themes/light/theme.tres"), "Light"],
+	[preload("res://assets/themes/purple/theme.tres"), "Purple"],
 ]
 onready var buttons_container : BoxContainer = $ThemeButtons
-onready var colors_container : BoxContainer = $ThemeColors
+onready var colors_container : BoxContainer = $ThemeColorsSpacer/ThemeColors
 onready var theme_color_preview_scene = preload("res://src/Preferences/ThemeColorPreview.tscn")
 
 
@@ -59,12 +60,18 @@ func change_theme(ID : int) -> void:
 		Global.theme_type = Global.Theme_Types.CARAMEL
 	elif ID == 4: # Light Theme
 		Global.theme_type = Global.Theme_Types.LIGHT
+	elif ID == 5: # Purple Theme
+		Global.theme_type = Global.Theme_Types.DARK
 
 	Global.control.theme = main_theme
 	Global.control.theme.default_font = font
 	Global.default_clear_color = main_theme.get_stylebox("panel", "PanelContainer").bg_color
 	VisualServer.set_default_clear_color(Color(Global.default_clear_color))
+
 	(Global.animation_timeline.get_stylebox("panel", "Panel") as StyleBoxFlat).bg_color = main_theme.get_stylebox("panel", "Panel").bg_color
+	var fake_vsplit_grabber : TextureRect = Global.find_node_by_name(Global.animation_timeline, "FakeVSplitContainerGrabber")
+	fake_vsplit_grabber.texture = main_theme.get_icon("grabber", "VSplitContainer")
+
 	var layer_button_panel_container : PanelContainer = Global.find_node_by_name(Global.animation_timeline, "LayerButtonPanelContainer")
 	(layer_button_panel_container.get_stylebox("panel", "PanelContainer") as StyleBoxFlat).bg_color = Global.default_clear_color
 
@@ -80,13 +87,6 @@ func change_theme(ID : int) -> void:
 	Global.vertical_ruler.add_stylebox_override("hover", ruler_style)
 	Global.vertical_ruler.add_stylebox_override("focus", ruler_style)
 
-	var fake_vsplit_grabber : TextureRect = Global.find_node_by_name(Global.animation_timeline, "FakeVSplitContainerGrabber")
-
-	if Global.theme_type == Global.Theme_Types.DARK or Global.theme_type == Global.Theme_Types.BLUE:
-		fake_vsplit_grabber.texture = preload("res://assets/themes/dark/icons/vsplit.png")
-	else:
-		fake_vsplit_grabber.texture = preload("res://assets/themes/light/icons/vsplit.png")
-
 	for button in get_tree().get_nodes_in_group("UIButtons"):
 		if button is TextureButton:
 			var last_backslash = button.texture_normal.resource_path.get_base_dir().find_last("/")

src/Preferences/PreferencesDialog.tscn

@@ -113,20 +113,23 @@ text = "System Language"
 
 [node name="Themes" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
 visible = false
-margin_top = 28.0
 margin_right = 498.0
-margin_bottom = 164.0
 script = ExtResource( 5 )
 
 [node name="ThemeButtons" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
-margin_right = 80.0
-margin_bottom = 136.0
 
-[node name="ThemeColors" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
-margin_left = 84.0
-margin_right = 134.0
-margin_bottom = 136.0
-custom_constants/separation = 6
+[node name="ThemeColorsSpacer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
+margin_right = 40.0
+margin_bottom = 40.0
+
+[node name="Control" type="Control" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes/ThemeColorsSpacer"]
+margin_right = 40.0
+margin_bottom = 40.0
+
+[node name="ThemeColors" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes/ThemeColorsSpacer"]
+margin_left = 4.0
+margin_right = 4.0
+custom_constants/separation = 12
 
 [node name="Canvas" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
 visible = false

src/Preferences/ThemeColorPreview.tscn

@@ -3,7 +3,7 @@
 [node name="ThemeColorPreview" type="ColorRect"]
 margin_right = 50.0
 margin_bottom = 14.0
-rect_min_size = Vector2( 50, 14 )
+rect_min_size = Vector2( 50, 16 )
 color = Color( 0.380392, 0.384314, 0.380392, 1 )
 __meta__ = {
 "_edit_use_anchors_": false

src/Tools/Bucket.tscn

@@ -1,8 +1,17 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/Tools/Bucket.gd" type="Script" id=3]
 
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 1, 1, 1, 1 )
+border_color = Color( 1, 1, 1, 1 )
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+anti_aliasing = false
+
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 1, 1, 1, 1 )
 border_color = Color( 1, 1, 1, 1 )
@@ -72,9 +81,11 @@ rect_min_size = Vector2( 32, 32 )
 hint_tooltip = "Select a brush"
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
-custom_styles/hover = SubResource( 1 )
-custom_styles/pressed = SubResource( 1 )
-custom_styles/normal = SubResource( 1 )
+custom_styles/hover = SubResource( 2 )
+custom_styles/pressed = SubResource( 2 )
+custom_styles/focus = SubResource( 1 )
+custom_styles/disabled = SubResource( 1 )
+custom_styles/normal = SubResource( 2 )
 
 [node name="Texture" type="TextureRect" parent="FillPattern/Type" index="0"]
 margin_right = 32.0

src/Tools/Draw.tscn

@@ -1,8 +1,17 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/Tools/Draw.gd" type="Script" id=3]
 
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 1, 1, 1, 1 )
+border_color = Color( 1, 1, 1, 1 )
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+anti_aliasing = false
+
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 1, 1, 1, 1 )
 border_color = Color( 1, 1, 1, 1 )
@@ -29,9 +38,11 @@ rect_min_size = Vector2( 32, 32 )
 hint_tooltip = "Select a brush"
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 0
-custom_styles/hover = SubResource( 1 )
-custom_styles/pressed = SubResource( 1 )
-custom_styles/normal = SubResource( 1 )
+custom_styles/hover = SubResource( 2 )
+custom_styles/pressed = SubResource( 2 )
+custom_styles/focus = SubResource( 1 )
+custom_styles/disabled = SubResource( 1 )
+custom_styles/normal = SubResource( 2 )
 
 [node name="Texture" type="TextureRect" parent="Brush/Type" index="0"]
 margin_right = 32.0

src/UI/BrushButton.tscn

@@ -17,6 +17,8 @@ margin_bottom = 32.0
 rect_min_size = Vector2( 32, 32 )
 custom_styles/hover = SubResource( 1 )
 custom_styles/pressed = SubResource( 1 )
+custom_styles/focus = SubResource( 1 )
+custom_styles/disabled = SubResource( 1 )
 custom_styles/normal = SubResource( 1 )
 button_mask = 7
 script = ExtResource( 2 )

src/UI/PatternButton.tscn

@@ -1,7 +1,16 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://src/UI/PatternButton.gd" type="Script" id=2]
 
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 1, 1, 1, 1 )
+border_color = Color( 1, 1, 1, 1 )
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+anti_aliasing = false
+
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 1, 1, 1, 1 )
 border_color = Color( 1, 1, 1, 1 )
@@ -15,9 +24,11 @@ anti_aliasing = false
 margin_right = 32.0
 margin_bottom = 32.0
 rect_min_size = Vector2( 32, 32 )
-custom_styles/hover = SubResource( 1 )
-custom_styles/pressed = SubResource( 1 )
-custom_styles/normal = SubResource( 1 )
+custom_styles/hover = SubResource( 2 )
+custom_styles/pressed = SubResource( 2 )
+custom_styles/focus = SubResource( 1 )
+custom_styles/disabled = SubResource( 1 )
+custom_styles/normal = SubResource( 2 )
 button_mask = 7
 script = ExtResource( 2 )
 

src/UI/Timeline/AnimationTimeline.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=44 format=2]
+[gd_scene load_steps=43 format=2]
 
 [ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1]
 [ext_resource path="res://assets/graphics/dark_themes/layers/new_layer.png" type="Texture" id=2]
@@ -7,7 +7,6 @@
 [ext_resource path="res://assets/graphics/dark_themes/layers/move_down_disabled.png" type="Texture" id=5]
 [ext_resource path="res://assets/graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6]
 [ext_resource path="res://assets/graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7]
-[ext_resource path="res://assets/themes/dark/icons/vsplit.png" type="Texture" id=8]
 [ext_resource path="res://src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18]
 [ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19]
 [ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20]
@@ -759,9 +758,9 @@ rect_min_size = Vector2( 214, 0 )
 
 [node name="OpacityLabel" type="Label" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"]
 margin_right = 53.0
-margin_bottom = 32.0
+margin_bottom = 14.0
 size_flags_horizontal = 0
-size_flags_vertical = 1
+size_flags_vertical = 0
 text = "Opacity:"
 valign = 1
 
@@ -930,7 +929,6 @@ margin_top = -6.0
 margin_right = 24.0
 margin_bottom = -4.76837e-07
 mouse_filter = 2
-texture = ExtResource( 8 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

src/UI/Timeline/LayerButton.tscn

@@ -26,8 +26,12 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="EmptySpacer" type="Control" parent="HBoxContainer"]
+margin_bottom = 36.0
+
 [node name="LayerButtons" type="HBoxContainer" parent="HBoxContainer"]
-margin_right = 104.0
+margin_left = 4.0
+margin_right = 108.0
 margin_bottom = 36.0
 
 [node name="VisibilityButton" type="Button" parent="HBoxContainer/LayerButtons" groups=[
@@ -122,8 +126,8 @@ __meta__ = {
 }
 
 [node name="LayerName" type="HBoxContainer" parent="HBoxContainer"]
-margin_left = 108.0
-margin_right = 212.0
+margin_left = 112.0
+margin_right = 216.0
 margin_bottom = 36.0
 rect_min_size = Vector2( 104, 0 )
 mouse_default_cursor_shape = 2

src/UI/TopMenuContainer.tscn

@@ -21,7 +21,7 @@ __meta__ = {
 
 [node name="FileMenu" type="MenuButton" parent="MenuItems"]
 margin_right = 35.0
-margin_bottom = 20.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "File"
 switch_on_hover = true
@@ -29,7 +29,7 @@ switch_on_hover = true
 [node name="EditMenu" type="MenuButton" parent="MenuItems"]
 margin_left = 39.0
 margin_right = 75.0
-margin_bottom = 20.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "Edit"
 switch_on_hover = true
@@ -37,7 +37,7 @@ switch_on_hover = true
 [node name="ViewMenu" type="MenuButton" parent="MenuItems"]
 margin_left = 79.0
 margin_right = 121.0
-margin_bottom = 20.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "View"
 switch_on_hover = true
@@ -45,7 +45,7 @@ switch_on_hover = true
 [node name="ImageMenu" type="MenuButton" parent="MenuItems"]
 margin_left = 125.0
 margin_right = 177.0
-margin_bottom = 20.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "Image"
 switch_on_hover = true
@@ -53,7 +53,7 @@ switch_on_hover = true
 [node name="HelpMenu" type="MenuButton" parent="MenuItems"]
 margin_left = 181.0
 margin_right = 223.0
-margin_bottom = 20.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "Help"
 switch_on_hover = true
@@ -91,10 +91,10 @@ anchor_top = 0.5
 anchor_right = 1.0
 anchor_bottom = 0.5
 margin_left = -330.0
-margin_top = -14.0
-margin_bottom = 14.0
+margin_top = -10.0
+margin_right = 0.00012207
+margin_bottom = 13.0
 grow_horizontal = 2
-size_flags_vertical = 0
 alignment = 1
 __meta__ = {
 "_edit_use_anchors_": false
@@ -103,10 +103,9 @@ __meta__ = {
 [node name="CurrentFrame" type="Label" parent="HBoxContainer"]
 margin_left = 106.0
 margin_right = 198.0
-margin_bottom = 28.0
+margin_bottom = 23.0
 size_flags_vertical = 1
 text = "Current frame:"
-valign = 1
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -114,7 +113,6 @@ __meta__ = {
 [node name="CurrentFrameMark" type="Label" parent="HBoxContainer"]
 margin_left = 202.0
 margin_right = 223.0
-margin_bottom = 28.0
+margin_bottom = 23.0
 size_flags_vertical = 1
 text = "1/2"
-valign = 1

src/UI/UI.tscn

@@ -48,8 +48,10 @@ size_flags_vertical = 3
 anchor_left = 0.5
 anchor_right = 0.5
 margin_left = -20.5
-margin_right = 20.5
-margin_bottom = 254.0
+margin_right = -6.5
+margin_bottom = 14.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -59,6 +61,8 @@ margin_left = 7.0
 margin_top = 7.0
 margin_right = 39.0
 margin_bottom = 255.0
+size_flags_horizontal = 4
+size_flags_vertical = 0
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false