diff --git a/src/Autoload/Tools.gd b/src/Autoload/Tools.gd index 8ec12a12c..e4f553476 100644 --- a/src/Autoload/Tools.gd +++ b/src/Autoload/Tools.gd @@ -74,8 +74,8 @@ func _ready() -> void: yield(get_tree(), "idle_frame") _slots[BUTTON_LEFT] = Slot.new("Left tool") _slots[BUTTON_RIGHT] = Slot.new("Right tool") - _panels[BUTTON_LEFT] = Global.control.find_node("LeftPanelContainer") - _panels[BUTTON_RIGHT] = Global.control.find_node("RightPanelContainer") + _panels[BUTTON_LEFT] = Global.control.find_node("LeftPanelContainer", true, false) + _panels[BUTTON_RIGHT] = Global.control.find_node("RightPanelContainer", true, false) var value = Global.config_cache.get_value(_slots[BUTTON_LEFT].kname, "tool", "Pencil") if not value in _tools: @@ -168,6 +168,8 @@ func set_button_size(button_size : int) -> void: # It doesn't actually set the size to zero, it just resets it _tool_buttons.get_parent().rect_size = Vector2.ZERO + _tool_buttons.columns = 1 + _tool_buttons.get_parent().get_parent().get_parent().get_parent().split_offset = 0 func update_tool_buttons() -> void: diff --git a/src/Main.gd b/src/Main.gd index d6c09a859..925ece4a0 100644 --- a/src/Main.gd +++ b/src/Main.gd @@ -12,11 +12,11 @@ onready var tools_and_canvas : HSplitContainer = $MenuAndUI/UI/ToolsAndCanvas onready var tallscreen_hsplit_container : HSplitContainer = $MenuAndUI/UI/ToolsAndCanvas/CanvasAndTimeline/TallscreenHSplitContainer onready var bottom_panel : VSplitContainer = tallscreen_hsplit_container.get_node("BottomPanel") onready var right_panel := $MenuAndUI/UI/RightPanel -onready var tool_and_palette_vsplit := $MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit -onready var color_and_tool_options := $MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions -onready var canvas_preview_container := $MenuAndUI/UI/RightPanel/PreviewAndPalettes/CanvasPreviewContainer +onready var tool_and_palette_vsplit := $MenuAndUI/UI/RightPanel/MarginContainer/PreviewAndPalettes/ToolAndPaletteVSplit +onready var color_and_tool_options := $MenuAndUI/UI/RightPanel/MarginContainer/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions +onready var canvas_preview_container := $MenuAndUI/UI/RightPanel/MarginContainer/PreviewAndPalettes/CanvasPreviewContainer onready var tool_panel := $MenuAndUI/UI/ToolsAndCanvas/ToolPanel -onready var scroll_container := $MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer +onready var scroll_container := $MenuAndUI/UI/RightPanel/MarginContainer/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -87,11 +87,19 @@ func change_ui_layout(mode : String) -> void: tallscreen_hsplit_container.split_offset = tools_and_canvas.split_offset reparent_node_to(Global.animation_timeline, tallscreen_hsplit_container.get_node("BottomPanel"), 0) reparent_node_to(right_panel, bottom_panel, 0) - right_panel.rect_min_size.y = 300 + right_panel.rect_min_size.y = 322 reparent_node_to(canvas_preview_container, tool_and_palette_vsplit, 1) tool_and_palette_vsplit = replace_node_with(tool_and_palette_vsplit, HBoxContainer.new()) + tool_and_palette_vsplit.set("custom_constants/separation", 8) color_and_tool_options.rect_min_size.x = 280 reparent_node_to(tool_panel, tallscreen_hsplit_container, 0) + + var right_panel_margin : MarginContainer = right_panel.find_node("MarginContainer", true, false) + right_panel_margin.set("custom_constants/margin_top", 8) + right_panel_margin.set("custom_constants/margin_left", 0) + right_panel_margin.set("custom_constants/margin_right", 0) + right_panel.find_node("PalettePanel", true, false).size_flags_horizontal = SIZE_FILL + elif mode == "widescreen" and tallscreen_is_active: tallscreen_is_active = false # Reparenting and hiding nodes to adjust wide-screen @@ -100,12 +108,18 @@ func change_ui_layout(mode : String) -> void: tools_and_canvas.split_offset = tallscreen_hsplit_container.split_offset reparent_node_to(right_panel, ui, -1) right_panel.rect_min_size.y = 0 - reparent_node_to(canvas_preview_container, right_panel.get_node("PreviewAndPalettes"), 0) + reparent_node_to(canvas_preview_container, right_panel.find_node("PreviewAndPalettes"), 0) tool_and_palette_vsplit = replace_node_with(tool_and_palette_vsplit, VSplitContainer.new()) color_and_tool_options.rect_min_size.x = 0 canvas_preview_container.visible = true reparent_node_to(tool_panel, ui.find_node("ToolsAndCanvas"), 0) + var right_panel_margin : MarginContainer = right_panel.find_node("MarginContainer", true, false) + right_panel_margin.set("custom_constants/margin_top", 0) + right_panel_margin.set("custom_constants/margin_left", 8) + right_panel_margin.set("custom_constants/margin_right", 8) + right_panel.find_node("PalettePanel", true, false).size_flags_horizontal = SIZE_EXPAND_FILL + if get_viewport_rect().size.x < 908 and mode == "tallscreen": canvas_preview_container.visible = false else: @@ -121,7 +135,7 @@ func change_ui_layout(mode : String) -> void: scroll_container.rect_min_size = Vector2(0, 0) color_and_tool_options.set("custom_constants/separation", 8) if mode == "widescreen": - reparent_node_to(canvas_preview_container, right_panel.get_node("PreviewAndPalettes"), 0) + reparent_node_to(canvas_preview_container, right_panel.find_node("PreviewAndPalettes", true, false), 0) else: reparent_node_to(canvas_preview_container, tool_and_palette_vsplit, 1) diff --git a/src/Palette/PalettePanel.tscn b/src/Palette/PalettePanel.tscn index f957fa872..5a500cca9 100644 --- a/src/Palette/PalettePanel.tscn +++ b/src/Palette/PalettePanel.tscn @@ -9,10 +9,10 @@ [ext_resource path="res://src/Palette/PalettePanel.gd" type="Script" id=8] [node name="PalettePanel" type="PanelContainer"] -margin_right = 324.0 +margin_right = 300.0 margin_bottom = 319.0 -rect_min_size = Vector2( 300, 0 ) -size_flags_horizontal = 4 +rect_min_size = Vector2( 318, 0 ) +size_flags_horizontal = 3 size_flags_vertical = 0 script = ExtResource( 8 ) __meta__ = { @@ -22,12 +22,12 @@ __meta__ = { [node name="PaletteVBoxContainer" type="VBoxContainer" parent="."] margin_left = 7.0 margin_top = 7.0 -margin_right = 317.0 +margin_right = 311.0 margin_bottom = 312.0 size_flags_horizontal = 3 [node name="PalettesLabel" type="Label" parent="PaletteVBoxContainer"] -margin_right = 310.0 +margin_right = 304.0 margin_bottom = 14.0 size_flags_horizontal = 3 size_flags_vertical = 0 @@ -36,11 +36,11 @@ align = 1 [node name="PaletteButtons" type="HBoxContainer" parent="PaletteVBoxContainer"] margin_top = 18.0 -margin_right = 310.0 +margin_right = 304.0 margin_bottom = 40.0 [node name="PaletteSelect" type="OptionButton" parent="PaletteVBoxContainer/PaletteButtons"] -margin_right = 258.0 +margin_right = 252.0 margin_bottom = 22.0 grow_horizontal = 0 rect_min_size = Vector2( 100, 0 ) @@ -52,8 +52,8 @@ clip_text = true [node name="EditPalette" type="Button" parent="PaletteVBoxContainer/PaletteButtons" groups=[ "UIButtons", ]] -margin_left = 262.0 -margin_right = 284.0 +margin_left = 256.0 +margin_right = 278.0 margin_bottom = 22.0 rect_min_size = Vector2( 22, 22 ) hint_tooltip = "Edit currently selected palette" @@ -81,8 +81,8 @@ __meta__ = { [node name="AddPalette" type="Button" parent="PaletteVBoxContainer/PaletteButtons" groups=[ "UIButtons", ]] -margin_left = 288.0 -margin_right = 310.0 +margin_left = 282.0 +margin_right = 304.0 margin_bottom = 22.0 rect_min_size = Vector2( 22, 22 ) hint_tooltip = "Create a new palette" @@ -109,12 +109,12 @@ __meta__ = { [node name="HSeparator" type="HSeparator" parent="PaletteVBoxContainer"] margin_top = 44.0 -margin_right = 310.0 +margin_right = 304.0 margin_bottom = 48.0 [node name="SwatchesContainer" type="HBoxContainer" parent="PaletteVBoxContainer"] margin_top = 52.0 -margin_right = 310.0 +margin_right = 304.0 margin_bottom = 104.0 size_flags_horizontal = 3 @@ -141,22 +141,22 @@ text = "-" [node name="PaletteScroll" type="VBoxContainer" parent="PaletteVBoxContainer/SwatchesContainer"] margin_left = 28.0 -margin_right = 310.0 +margin_right = 304.0 margin_bottom = 52.0 size_flags_horizontal = 3 script = ExtResource( 6 ) [node name="HBoxContainer" type="HBoxContainer" parent="PaletteVBoxContainer/SwatchesContainer/PaletteScroll"] -margin_right = 282.0 +margin_right = 276.0 size_flags_horizontal = 3 [node name="CenterContainer" type="CenterContainer" parent="PaletteVBoxContainer/SwatchesContainer/PaletteScroll/HBoxContainer"] -margin_right = 282.0 +margin_right = 276.0 size_flags_horizontal = 3 [node name="HBoxContainer" type="HBoxContainer" parent="PaletteVBoxContainer/SwatchesContainer/PaletteScroll/HBoxContainer/CenterContainer"] -margin_left = 141.0 -margin_right = 141.0 +margin_left = 138.0 +margin_right = 138.0 [node name="PaletteGrid" type="GridContainer" parent="PaletteVBoxContainer/SwatchesContainer/PaletteScroll/HBoxContainer/CenterContainer/HBoxContainer"] columns = 8 @@ -173,7 +173,7 @@ custom_step = 1.0 [node name="MarginContainer" type="MarginContainer" parent="PaletteVBoxContainer/SwatchesContainer/PaletteScroll"] margin_top = 4.0 -margin_right = 282.0 +margin_right = 276.0 margin_bottom = 4.0 custom_constants/margin_right = 20 custom_constants/margin_left = 6 @@ -181,7 +181,7 @@ custom_constants/margin_left = 6 [node name="HScrollBar" type="HScrollBar" parent="PaletteVBoxContainer/SwatchesContainer/PaletteScroll/MarginContainer"] visible = false margin_left = 6.0 -margin_right = 262.0 +margin_right = 256.0 margin_bottom = 12.0 step = 1.0 page = 8.0 diff --git a/src/Preferences/HandleThemes.gd b/src/Preferences/HandleThemes.gd index 13fcd7564..8c0c947ad 100644 --- a/src/Preferences/HandleThemes.gd +++ b/src/Preferences/HandleThemes.gd @@ -83,6 +83,11 @@ func change_theme(ID : int) -> void: var fake_vsplit_grabber : TextureRect = Global.animation_timeline.find_node("FakeVSplitContainerGrabber") fake_vsplit_grabber.texture = main_theme.get_icon("grabber", "VSplitContainer") + # Theming for left tools panel + var fake_hsplit_grabber : TextureRect = Global.tool_panel.get_node("FakeHSplitGrabber") + fake_hsplit_grabber.texture = main_theme.get_icon("grabber", "HSplitContainer") + (Global.tool_panel.get_stylebox("panel", "Panel") as StyleBoxFlat).bg_color = main_theme.get_stylebox("panel", "Panel").bg_color + var layer_button_panel_container : PanelContainer = Global.animation_timeline.find_node("LayerButtonPanelContainer") (layer_button_panel_container.get_stylebox("panel", "PanelContainer") as StyleBoxFlat).bg_color = Global.default_clear_color diff --git a/src/Preferences/PreferencesDialog.tscn b/src/Preferences/PreferencesDialog.tscn index bb6fb962c..17c1121c3 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -51,7 +51,7 @@ size_flags_horizontal = 3 [node name="VBoxContainer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer"] margin_right = 498.0 -margin_bottom = 24.0 +margin_bottom = 198.0 size_flags_horizontal = 3 [node name="Startup" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] diff --git a/src/UI/CanvasPreviewContainer.tscn b/src/UI/CanvasPreviewContainer.tscn index c166a8cdd..ded53d04e 100644 --- a/src/UI/CanvasPreviewContainer.tscn +++ b/src/UI/CanvasPreviewContainer.tscn @@ -7,10 +7,10 @@ [ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=5] [ext_resource path="res://assets/graphics/timeline/play.png" type="Texture" id=7] - [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 5 ) shader_param/size = 10.0 +shader_param/alpha = 1.0 shader_param/color1 = Color( 0.7, 0.7, 0.7, 1 ) shader_param/color2 = Color( 1, 1, 1, 1 ) shader_param/offset = Vector2( 0, 0 ) @@ -20,10 +20,9 @@ shader_param/follow_movement = false shader_param/follow_scale = false [node name="CanvasPreviewContainer" type="PanelContainer"] -margin_right = 278.0 -margin_bottom = 164.0 -rect_min_size = Vector2( 300, 0 ) -size_flags_horizontal = 4 +margin_right = 328.0 +margin_bottom = 174.0 +rect_min_size = Vector2( 318, 0 ) size_flags_vertical = 0 script = ExtResource( 3 ) __meta__ = { @@ -33,12 +32,12 @@ __meta__ = { [node name="HBoxContainer" type="HBoxContainer" parent="."] margin_left = 7.0 margin_top = 7.0 -margin_right = 293.0 -margin_bottom = 157.0 +margin_right = 321.0 +margin_bottom = 167.0 [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] margin_right = 20.0 -margin_bottom = 150.0 +margin_bottom = 160.0 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer"] margin_left = 6.0 @@ -52,7 +51,7 @@ align = 1 margin_left = 2.0 margin_top = 18.0 margin_right = 18.0 -margin_bottom = 108.0 +margin_bottom = 118.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 4 size_flags_vertical = 3 @@ -60,9 +59,9 @@ step = 0.01 [node name="Label2" type="Label" parent="HBoxContainer/VBoxContainer"] margin_left = 7.0 -margin_top = 112.0 +margin_top = 122.0 margin_right = 12.0 -margin_bottom = 126.0 +margin_bottom = 136.0 size_flags_horizontal = 4 text = "-" align = 1 @@ -70,9 +69,9 @@ align = 1 [node name="PlayButton" type="Button" parent="HBoxContainer/VBoxContainer" groups=[ "UIButtons", ]] -margin_top = 130.0 +margin_top = 140.0 margin_right = 20.0 -margin_bottom = 150.0 +margin_bottom = 160.0 rect_min_size = Vector2( 20, 0 ) mouse_default_cursor_shape = 2 toggle_mode = true @@ -94,12 +93,12 @@ __meta__ = { [node name="PreviewViewportContainer" type="ViewportContainer" parent="HBoxContainer"] margin_left = 24.0 -margin_right = 284.0 -margin_bottom = 150.0 -rect_min_size = Vector2( 0, 150 ) +margin_right = 314.0 +margin_bottom = 160.0 +rect_min_size = Vector2( 290, 160 ) [node name="Viewport" type="Viewport" parent="HBoxContainer/PreviewViewportContainer"] -size = Vector2( 260, 150 ) +size = Vector2( 290, 160 ) transparent_bg = true handle_input_locally = false render_target_update_mode = 3 @@ -114,5 +113,6 @@ offset = Vector2( 32, 32 ) current = true zoom = Vector2( 0.15, 0.15 ) script = ExtResource( 4 ) + [connection signal="value_changed" from="HBoxContainer/VBoxContainer/PreviewZoomSlider" to="." method="_on_PreviewZoomSlider_value_changed"] [connection signal="toggled" from="HBoxContainer/VBoxContainer/PlayButton" to="." method="_on_PlayButton_toggled"] diff --git a/src/UI/ColorAndToolOptions.gd b/src/UI/ColorAndToolOptions.gd index ffb75e0b5..594671dbb 100644 --- a/src/UI/ColorAndToolOptions.gd +++ b/src/UI/ColorAndToolOptions.gd @@ -1,8 +1,8 @@ extends VBoxContainer -onready var left_picker := $ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/LeftColorPickerButton -onready var right_picker := $ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton +onready var left_picker := $ColorPickersHorizontal/LeftColorPickerButton +onready var right_picker := $ColorPickersHorizontal/RightColorPickerButton func _ready() -> void: diff --git a/src/UI/ColorAndToolOptions.tscn b/src/UI/ColorAndToolOptions.tscn index e821ef9f5..bce3918df 100644 --- a/src/UI/ColorAndToolOptions.tscn +++ b/src/UI/ColorAndToolOptions.tscn @@ -7,8 +7,9 @@ [sub_resource type="ShortCut" id=1] [node name="ColorAndToolOptions" type="VBoxContainer"] -margin_right = 330.0 +margin_right = 300.0 margin_bottom = 255.0 +rect_min_size = Vector2( 318, 0 ) size_flags_vertical = 3 custom_constants/separation = 8 script = ExtResource( 8 ) @@ -16,39 +17,15 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ColorButtonsVertical" type="VBoxContainer" parent="."] -margin_right = 330.0 -margin_bottom = 51.0 -custom_constants/separation = 2 - -[node name="ColorSwitchCenter" type="CenterContainer" parent="ColorButtonsVertical"] -margin_right = 330.0 -margin_bottom = 7.0 - -[node name="ColorSwitch" type="TextureButton" parent="ColorButtonsVertical/ColorSwitchCenter" groups=[ -"UIButtons", -]] -margin_left = 152.0 -margin_right = 177.0 -margin_bottom = 7.0 -mouse_default_cursor_shape = 2 -shortcut_in_tooltip = false -shortcut = SubResource( 1 ) -texture_normal = ExtResource( 1 ) - -[node name="ColorPickersCenter" type="CenterContainer" parent="ColorButtonsVertical"] -margin_top = 9.0 -margin_right = 330.0 -margin_bottom = 41.0 - -[node name="ColorPickersHorizontal" type="HBoxContainer" parent="ColorButtonsVertical/ColorPickersCenter"] -margin_left = 94.0 -margin_right = 235.0 +[node name="ColorPickersHorizontal" type="HBoxContainer" parent="."] +margin_right = 318.0 margin_bottom = 32.0 custom_constants/separation = 13 +alignment = 1 -[node name="LeftColorPickerButton" type="ColorPickerButton" parent="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal"] -margin_right = 64.0 +[node name="LeftColorPickerButton" type="ColorPickerButton" parent="ColorPickersHorizontal"] +margin_left = 69.0 +margin_right = 133.0 margin_bottom = 32.0 rect_min_size = Vector2( 64, 32 ) hint_tooltip = "Choose a color for the left tool" @@ -56,9 +33,49 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 0 -[node name="RightColorPickerButton" type="ColorPickerButton" parent="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal"] -margin_left = 77.0 -margin_right = 141.0 +[node name="ColorButtonsVertical" type="VBoxContainer" parent="ColorPickersHorizontal"] +margin_left = 146.0 +margin_right = 171.0 +margin_bottom = 32.0 +custom_constants/separation = 2 +alignment = 1 + +[node name="ColorSwitchCenter" type="CenterContainer" parent="ColorPickersHorizontal/ColorButtonsVertical"] +margin_top = 6.0 +margin_right = 25.0 +margin_bottom = 13.0 + +[node name="ColorSwitch" type="TextureButton" parent="ColorPickersHorizontal/ColorButtonsVertical/ColorSwitchCenter" groups=[ +"UIButtons", +]] +margin_right = 25.0 +margin_bottom = 7.0 +mouse_default_cursor_shape = 2 +shortcut_in_tooltip = false +shortcut = SubResource( 1 ) +texture_normal = ExtResource( 1 ) + +[node name="ColorPickersCenter" type="CenterContainer" parent="ColorPickersHorizontal/ColorButtonsVertical"] +margin_top = 15.0 +margin_right = 25.0 +margin_bottom = 15.0 + +[node name="ColorDefaultsCenter" type="CenterContainer" parent="ColorPickersHorizontal/ColorButtonsVertical"] +margin_top = 17.0 +margin_right = 25.0 +margin_bottom = 25.0 +size_flags_horizontal = 3 + +[node name="ColorDefaults" type="TextureButton" parent="ColorPickersHorizontal/ColorButtonsVertical/ColorDefaultsCenter"] +margin_right = 25.0 +margin_bottom = 8.0 +hint_tooltip = "Reset the colors to their default state (black for left, white for right)" +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 2 ) + +[node name="RightColorPickerButton" type="ColorPickerButton" parent="ColorPickersHorizontal"] +margin_left = 184.0 +margin_right = 248.0 margin_bottom = 32.0 rect_min_size = Vector2( 64, 32 ) hint_tooltip = "Choose a color for the right tool" @@ -67,51 +84,37 @@ size_flags_horizontal = 0 size_flags_vertical = 0 color = Color( 1, 1, 1, 1 ) -[node name="ColorDefaultsCenter" type="CenterContainer" parent="ColorButtonsVertical"] -margin_top = 43.0 -margin_right = 330.0 -margin_bottom = 51.0 -size_flags_horizontal = 3 - -[node name="ColorDefaults" type="TextureButton" parent="ColorButtonsVertical/ColorDefaultsCenter"] -margin_left = 152.0 -margin_right = 177.0 -margin_bottom = 8.0 -hint_tooltip = "Reset the colors to their default state (black for left, white for right)" -mouse_default_cursor_shape = 2 -texture_normal = ExtResource( 2 ) - [node name="ScrollContainer" type="ScrollContainer" parent="."] -margin_top = 59.0 -margin_right = 330.0 +margin_top = 40.0 +margin_right = 318.0 margin_bottom = 255.0 size_flags_vertical = 3 [node name="ToolOptions" type="HBoxContainer" parent="ScrollContainer"] -margin_right = 330.0 -margin_bottom = 196.0 +margin_right = 318.0 +margin_bottom = 215.0 size_flags_horizontal = 3 size_flags_vertical = 3 +custom_constants/separation = 8 [node name="LeftPanelContainer" type="PanelContainer" parent="ScrollContainer/ToolOptions"] -margin_left = 16.0 -margin_right = 146.0 -margin_bottom = 196.0 +margin_right = 155.0 +margin_bottom = 215.0 rect_min_size = Vector2( 130, 0 ) -size_flags_horizontal = 6 +size_flags_horizontal = 3 [node name="RightPanelContainer" type="PanelContainer" parent="ScrollContainer/ToolOptions"] -margin_left = 183.0 -margin_right = 313.0 -margin_bottom = 196.0 +margin_left = 163.0 +margin_right = 318.0 +margin_bottom = 215.0 rect_min_size = Vector2( 130, 0 ) -size_flags_horizontal = 6 +size_flags_horizontal = 3 -[connection signal="pressed" from="ColorButtonsVertical/ColorSwitchCenter/ColorSwitch" to="." method="_on_ColorSwitch_pressed"] -[connection signal="color_changed" from="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/LeftColorPickerButton" to="." method="_on_ColorPickerButton_color_changed" binds= [ false ]] -[connection signal="popup_closed" from="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/LeftColorPickerButton" to="." method="_on_ColorPickerButton_popup_closed"] -[connection signal="pressed" from="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/LeftColorPickerButton" to="." method="_on_ColorPickerButton_pressed"] -[connection signal="color_changed" from="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton" to="." method="_on_ColorPickerButton_color_changed" binds= [ true ]] -[connection signal="popup_closed" from="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton" to="." method="_on_ColorPickerButton_popup_closed"] -[connection signal="pressed" from="ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton" to="." method="_on_ColorPickerButton_pressed"] -[connection signal="pressed" from="ColorButtonsVertical/ColorDefaultsCenter/ColorDefaults" to="." method="_on_ColorDefaults_pressed"] +[connection signal="color_changed" from="ColorPickersHorizontal/LeftColorPickerButton" to="." method="_on_ColorPickerButton_color_changed" binds= [ false ]] +[connection signal="popup_closed" from="ColorPickersHorizontal/LeftColorPickerButton" to="." method="_on_ColorPickerButton_popup_closed"] +[connection signal="pressed" from="ColorPickersHorizontal/LeftColorPickerButton" to="." method="_on_ColorPickerButton_pressed"] +[connection signal="pressed" from="ColorPickersHorizontal/ColorButtonsVertical/ColorSwitchCenter/ColorSwitch" to="." method="_on_ColorSwitch_pressed"] +[connection signal="pressed" from="ColorPickersHorizontal/ColorButtonsVertical/ColorDefaultsCenter/ColorDefaults" to="." method="_on_ColorDefaults_pressed"] +[connection signal="color_changed" from="ColorPickersHorizontal/RightColorPickerButton" to="." method="_on_ColorPickerButton_color_changed" binds= [ true ]] +[connection signal="popup_closed" from="ColorPickersHorizontal/RightColorPickerButton" to="." method="_on_ColorPickerButton_popup_closed"] +[connection signal="pressed" from="ColorPickersHorizontal/RightColorPickerButton" to="." method="_on_ColorPickerButton_pressed"] diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn index f1c4d43dd..457687c1b 100644 --- a/src/UI/Timeline/AnimationTimeline.tscn +++ b/src/UI/Timeline/AnimationTimeline.tscn @@ -110,7 +110,7 @@ HScrollBar/styles/scroll_focus = SubResource( 19 ) margin_top = 438.0 margin_right = 902.0 margin_bottom = 638.0 -rect_min_size = Vector2( 0, 200 ) +rect_min_size = Vector2( 0, 160 ) size_flags_horizontal = 3 custom_styles/panel = SubResource( 1 ) script = ExtResource( 1 ) @@ -118,35 +118,39 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="AnimationContainer" type="HBoxContainer" parent="."] +[node name="MarginContainer" type="MarginContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +custom_constants/margin_top = 2 +custom_constants/margin_bottom = 8 __meta__ = { "_edit_use_anchors_": false } -[node name="TimelineContainer" type="VBoxContainer" parent="AnimationContainer"] +[node name="AnimationContainer" type="HBoxContainer" parent="MarginContainer"] +margin_top = 2.0 margin_right = 902.0 -margin_bottom = 200.0 +margin_bottom = 192.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TimelineContainer" type="VBoxContainer" parent="MarginContainer/AnimationContainer"] +margin_right = 902.0 +margin_bottom = 190.0 size_flags_horizontal = 3 -[node name="SpacerControl" type="Control" parent="AnimationContainer/TimelineContainer"] +[node name="TimelineButtons" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer"] margin_right = 902.0 -margin_bottom = 4.0 -rect_min_size = Vector2( 0, 4 ) - -[node name="TimelineButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer"] -margin_top = 8.0 -margin_right = 902.0 -margin_bottom = 46.0 +margin_bottom = 38.0 size_flags_horizontal = 3 -[node name="LayerButtonPanelContainer" type="PanelContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons"] +[node name="LayerButtonPanelContainer" type="PanelContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons"] margin_right = 186.0 margin_bottom = 38.0 custom_styles/panel = SubResource( 2 ) -[node name="LayerButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer"] +[node name="LayerButtons" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer"] margin_left = 4.5 margin_top = 3.0 margin_right = 181.5 @@ -154,7 +158,7 @@ margin_bottom = 25.0 size_flags_vertical = 0 custom_constants/separation = 9 -[node name="AddLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ +[node name="AddLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ "UIButtons", ]] margin_right = 22.0 @@ -164,7 +168,7 @@ hint_tooltip = "Create a new layer" focus_mode = 0 mouse_default_cursor_shape = 2 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -180,7 +184,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="RemoveLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ +[node name="RemoveLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ "UIButtons", ]] margin_left = 31.0 @@ -192,7 +196,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -208,7 +212,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveUpLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ +[node name="MoveUpLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ "UIButtons", ]] margin_left = 62.0 @@ -220,7 +224,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -236,7 +240,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveDownLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ +[node name="MoveDownLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ "UIButtons", ]] margin_left = 93.0 @@ -248,7 +252,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -264,7 +268,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CloneLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ +[node name="CloneLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ "UIButtons", ]] margin_left = 124.0 @@ -275,7 +279,7 @@ hint_tooltip = "Clone current layer" focus_mode = 0 mouse_default_cursor_shape = 2 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -291,7 +295,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MergeDownLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ +[node name="MergeDownLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ "UIButtons", ]] margin_left = 155.0 @@ -303,7 +307,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -319,18 +323,18 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Control" type="Control" parent="AnimationContainer/TimelineContainer/TimelineButtons"] +[node name="Control" type="Control" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons"] margin_left = 190.0 margin_right = 386.0 margin_bottom = 38.0 size_flags_horizontal = 3 -[node name="PanelContainer" type="PanelContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons"] +[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons"] margin_left = 390.0 margin_right = 902.0 margin_bottom = 38.0 -[node name="AnimationButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer"] +[node name="AnimationButtons" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer"] margin_left = 7.0 margin_top = 7.0 margin_right = 505.0 @@ -340,11 +344,11 @@ size_flags_horizontal = 3 custom_constants/separation = 40 alignment = 2 -[node name="FrameButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] +[node name="FrameButtons" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] margin_right = 140.0 margin_bottom = 24.0 -[node name="AddFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ +[node name="AddFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] margin_top = 2.0 @@ -357,7 +361,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -371,7 +375,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="DeleteFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ +[node name="DeleteFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] margin_left = 24.0 @@ -385,7 +389,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -401,7 +405,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CopyFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ +[node name="CopyFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] margin_left = 48.0 @@ -415,7 +419,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -429,7 +433,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="FrameTagButton" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ +[node name="FrameTagButton" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] margin_left = 72.0 @@ -443,7 +447,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -457,7 +461,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveLeft" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ +[node name="MoveLeft" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] margin_left = 96.0 @@ -471,7 +475,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -486,7 +490,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveRight" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ +[node name="MoveRight" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] margin_left = 120.0 @@ -500,7 +504,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -514,12 +518,12 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlaybackButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] +[node name="PlaybackButtons" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] margin_left = 180.0 margin_right = 320.0 margin_bottom = 24.0 -[node name="FirstFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="FirstFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_top = 2.0 @@ -533,7 +537,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 4 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -547,7 +551,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PreviousFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="PreviousFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 24.0 @@ -562,7 +566,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 6 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -576,7 +580,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlayBackwards" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="PlayBackwards" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 48.0 @@ -592,7 +596,7 @@ toggle_mode = true shortcut_in_tooltip = false shortcut = SubResource( 8 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -606,7 +610,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlayForward" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="PlayForward" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 72.0 @@ -623,7 +627,7 @@ toggle_mode = true shortcut_in_tooltip = false shortcut = SubResource( 10 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -637,7 +641,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="NextFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="NextFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 96.0 @@ -652,7 +656,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 12 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -666,7 +670,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LastFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="LastFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 120.0 @@ -681,7 +685,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 14 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -695,12 +699,12 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LoopButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] +[node name="LoopButtons" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] margin_left = 360.0 margin_right = 498.0 margin_bottom = 24.0 -[node name="OnionSkinningSettings" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ +[node name="OnionSkinningSettings" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ "UIButtons", ]] margin_top = 2.0 @@ -712,7 +716,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -728,7 +732,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="OnionSkinning" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ +[node name="OnionSkinning" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ "UIButtons", ]] margin_left = 16.0 @@ -741,7 +745,7 @@ focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -757,7 +761,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LoopAnim" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ +[node name="LoopAnim" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ "UIButtons", ]] margin_left = 40.0 @@ -770,7 +774,7 @@ focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -784,7 +788,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="FPSValue" type="SpinBox" parent="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons"] +[node name="FPSValue" type="SpinBox" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons"] margin_left = 64.0 margin_right = 138.0 margin_bottom = 24.0 @@ -798,24 +802,24 @@ value = 6.0 align = 1 suffix = "FPS" -[node name="OpacityAndTagContainer" type="HBoxContainer" parent="AnimationContainer/TimelineContainer"] -margin_top = 50.0 +[node name="OpacityAndTagContainer" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer"] +margin_top = 42.0 margin_right = 902.0 -margin_bottom = 82.0 +margin_bottom = 74.0 custom_constants/separation = 2 -[node name="SpacerControl" type="Control" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer"] +[node name="SpacerControl" type="Control" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer"] margin_right = 4.0 margin_bottom = 32.0 rect_min_size = Vector2( 4, 0 ) -[node name="OpacityContainer" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer"] +[node name="OpacityContainer" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer"] margin_left = 6.0 margin_right = 186.0 margin_bottom = 32.0 rect_min_size = Vector2( 180, 0 ) -[node name="OpacityLabel" type="Label" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] +[node name="OpacityLabel" type="Label" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] margin_right = 53.0 margin_bottom = 14.0 size_flags_horizontal = 0 @@ -823,7 +827,7 @@ size_flags_vertical = 0 text = "Opacity:" valign = 1 -[node name="OpacitySlider" type="HSlider" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] +[node name="OpacitySlider" type="HSlider" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] margin_left = 57.0 margin_right = 102.0 margin_bottom = 32.0 @@ -834,7 +838,7 @@ size_flags_vertical = 1 value = 100.0 ticks_on_borders = true -[node name="OpacitySpinBox" type="SpinBox" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] +[node name="OpacitySpinBox" type="SpinBox" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] margin_left = 106.0 margin_top = 4.0 margin_right = 180.0 @@ -844,13 +848,13 @@ size_flags_vertical = 4 value = 100.0 align = 1 -[node name="SpacerControl2" type="Control" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer"] +[node name="SpacerControl2" type="Control" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer"] margin_left = 188.0 margin_right = 217.0 margin_bottom = 32.0 rect_min_size = Vector2( 29, 0 ) -[node name="TagScroll" type="ScrollContainer" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer"] +[node name="TagScroll" type="ScrollContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer"] margin_left = 219.0 margin_right = 902.0 margin_bottom = 32.0 @@ -859,37 +863,31 @@ size_flags_horizontal = 3 theme = SubResource( 20 ) scroll_vertical_enabled = false -[node name="TagContainer" type="Control" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/TagScroll"] +[node name="TagContainer" type="Control" parent="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer/TagScroll"] -[node name="SpacerControl2" type="Control" parent="AnimationContainer/TimelineContainer"] -margin_top = 86.0 +[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/AnimationContainer/TimelineContainer"] +margin_top = 78.0 margin_right = 902.0 -margin_bottom = 94.0 -rect_min_size = Vector2( 0, 8 ) - -[node name="PanelContainer" type="PanelContainer" parent="AnimationContainer/TimelineContainer"] -margin_top = 98.0 -margin_right = 902.0 -margin_bottom = 200.0 +margin_bottom = 190.0 size_flags_vertical = 3 -[node name="TimelineScroll" type="ScrollContainer" parent="AnimationContainer/TimelineContainer/PanelContainer"] +[node name="TimelineScroll" type="ScrollContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer"] margin_left = 7.0 margin_top = 7.0 margin_right = 895.0 -margin_bottom = 95.0 +margin_bottom = 105.0 size_flags_vertical = 3 -[node name="LayersAndFrames" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll"] +[node name="LayersAndFrames" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll"] margin_right = 252.0 -margin_bottom = 88.0 +margin_bottom = 98.0 size_flags_vertical = 3 -[node name="LayerVBoxCont" type="VBoxContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] +[node name="LayerVBoxCont" type="VBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] margin_right = 212.0 -margin_bottom = 88.0 +margin_bottom = 98.0 -[node name="LayerLabel" type="Label" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] +[node name="LayerLabel" type="Label" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] margin_right = 212.0 margin_bottom = 16.0 rect_min_size = Vector2( 0, 16 ) @@ -897,29 +895,29 @@ text = "Layers" align = 1 valign = 1 -[node name="LayersContainer" type="VBoxContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] +[node name="LayersContainer" type="VBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] margin_top = 20.0 margin_right = 212.0 margin_bottom = 56.0 -[node name="LayerContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont/LayersContainer" instance=ExtResource( 18 )] +[node name="LayerContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont/LayersContainer" instance=ExtResource( 18 )] margin_right = 212.0 -[node name="FrameButtonsAndIds" type="VBoxContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] +[node name="FrameButtonsAndIds" type="VBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] margin_left = 216.0 margin_right = 252.0 -margin_bottom = 88.0 +margin_bottom = 98.0 -[node name="FrameIDs" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] +[node name="FrameIDs" type="HBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] margin_right = 36.0 margin_bottom = 20.0 rect_min_size = Vector2( 0, 16 ) -[node name="FrameButton" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds/FrameIDs" instance=ExtResource( 9 )] +[node name="FrameButton" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds/FrameIDs" instance=ExtResource( 9 )] margin_right = 36.0 rect_min_size = Vector2( 36, 0 ) -[node name="FramesContainer" type="VBoxContainer" parent="AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] +[node name="FramesContainer" type="VBoxContainer" parent="MarginContainer/AnimationContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] margin_top = 24.0 margin_right = 36.0 margin_bottom = 24.0 @@ -994,30 +992,30 @@ __meta__ = { "_edit_use_anchors_": false } -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer" to="." method="add_layer" binds= [ true ]] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft" to="." method="_on_MoveLeft_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight" to="." method="_on_MoveRight_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] -[connection signal="toggled" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] -[connection signal="toggled" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] -[connection signal="value_changed" from="AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] -[connection signal="value_changed" from="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] -[connection signal="value_changed" from="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySpinBox" to="." method="_on_OpacitySlider_value_changed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer" to="." method="add_layer" binds= [ true ]] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft" to="." method="_on_MoveLeft_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight" to="." method="_on_MoveRight_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] +[connection signal="toggled" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] +[connection signal="toggled" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] +[connection signal="pressed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] +[connection signal="value_changed" from="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] +[connection signal="value_changed" from="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] +[connection signal="value_changed" from="MarginContainer/AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySpinBox" to="." method="_on_OpacitySlider_value_changed"] [connection signal="timeout" from="AnimationTimer" to="." method="_on_AnimationTimer_timeout"] [connection signal="popup_hide" from="OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_popup_hide"] [connection signal="value_changed" from="OnionSkinningSettings/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"] diff --git a/src/UI/ToolButtons.gd b/src/UI/ToolButtons.gd index 6a26431f2..5da55fd01 100644 --- a/src/UI/ToolButtons.gd +++ b/src/UI/ToolButtons.gd @@ -28,6 +28,9 @@ func _ready() -> void: t[0].connect("pressed", self, "_on_Tool_pressed", [t[0]]) Global.update_hint_tooltips() + # Resize tools panel when window gets resized + get_tree().get_root().connect("size_changed", self, "_on_ToolsAndCanvas_dragged") + func _input(event : InputEvent) -> void: if not Global.has_focus: @@ -50,9 +53,12 @@ func _on_Tool_pressed(tool_pressed : BaseButton) -> void: Tools.assign_tool(tool_pressed.name, button) -func _on_ToolsAndCanvas_dragged(_offset : int) -> void: - var tool_panel_size : Vector2 = get_parent().get_parent().rect_size - columns = clamp(tool_panel_size.x / 40, 1, 8) +func _on_ToolsAndCanvas_dragged(_offset : int = 0) -> void: + var tool_panel_size : Vector2 = get_parent().get_parent().get_parent().rect_size + if Global.tool_button_size == Global.ButtonSize.SMALL: + columns = tool_panel_size.x / 28.5 + else: + columns = tool_panel_size.x / 36.5 # It doesn't actually set the size to zero, it just resets it get_parent().rect_size = Vector2.ZERO diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index 25ef66b48..4ef250c0c 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=2] +[gd_scene load_steps=37 format=2] [ext_resource path="res://src/UI/ToolButtons.gd" type="Script" id=1] [ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=2] @@ -33,6 +33,10 @@ [ext_resource path="res://assets/graphics/tools/magicwand.png" type="Texture" id=33] [ext_resource path="res://assets/graphics/tools/tool_background.png" type="Texture" id=34] +[sub_resource type="StyleBoxFlat" id=4] +bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 1 ) +expand_margin_right = 20.0 + [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 9 ) shader_param/size = 10.0 @@ -74,19 +78,46 @@ __meta__ = { } [node name="ToolsAndCanvas" type="HSplitContainer" parent="."] -margin_right = 950.0 +margin_right = 946.0 margin_bottom = 692.0 size_flags_horizontal = 3 +custom_constants/autohide = 0 +custom_constants/separation = 8 [node name="ToolPanel" type="Panel" parent="ToolsAndCanvas"] -margin_right = 48.0 +margin_right = 42.0 margin_bottom = 692.0 -rect_min_size = Vector2( 48, 0 ) +rect_min_size = Vector2( 42, 0 ) size_flags_vertical = 3 +custom_styles/panel = SubResource( 4 ) -[node name="PanelContainer" type="PanelContainer" parent="ToolsAndCanvas/ToolPanel"] -margin_left = 9.0 -margin_right = 47.0 +[node name="FakeHSplitGrabber" type="TextureRect" parent="ToolsAndCanvas/ToolPanel"] +anchor_left = 1.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = -1.0 +margin_top = -24.0 +margin_right = 5.0 +margin_bottom = 24.0 +rect_min_size = Vector2( 0, 48 ) +mouse_filter = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MarginContainer" type="MarginContainer" parent="ToolsAndCanvas/ToolPanel"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_constants/margin_left = 4 +custom_constants/margin_bottom = 8 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="PanelContainer" type="PanelContainer" parent="ToolsAndCanvas/ToolPanel/MarginContainer"] +margin_left = 4.0 +margin_right = 42.0 margin_bottom = 486.0 size_flags_horizontal = 0 size_flags_vertical = 0 @@ -94,7 +125,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolButtons" type="GridContainer" parent="ToolsAndCanvas/ToolPanel/PanelContainer"] +[node name="ToolButtons" type="GridContainer" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer"] margin_left = 7.0 margin_top = 7.0 margin_right = 31.0 @@ -103,7 +134,7 @@ size_flags_horizontal = 4 size_flags_vertical = 0 script = ExtResource( 1 ) -[node name="RectSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="RectSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_right = 24.0 @@ -112,7 +143,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/RectSelect"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -127,7 +158,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/RectSelect"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -146,7 +177,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/RectSelect"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -156,7 +187,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="EllipseSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="EllipseSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 28.0 @@ -166,7 +197,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseSelect"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/EllipseSelect"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -181,7 +212,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseSelect"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/EllipseSelect"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -200,7 +231,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseSelect"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/EllipseSelect"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -210,7 +241,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PolygonSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="PolygonSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 56.0 @@ -220,7 +251,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/PolygonSelect"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/PolygonSelect"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -235,7 +266,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/PolygonSelect"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/PolygonSelect"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -254,7 +285,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/PolygonSelect"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/PolygonSelect"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -264,7 +295,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ColorSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="ColorSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 84.0 @@ -274,7 +305,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/ColorSelect"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -289,7 +320,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/ColorSelect"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -308,7 +339,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/ColorSelect"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -318,7 +349,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MagicWand" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="MagicWand" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 112.0 @@ -328,7 +359,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/MagicWand"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -343,7 +374,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/MagicWand"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -362,7 +393,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/MagicWand"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -372,7 +403,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Lasso" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Lasso" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 140.0 @@ -382,7 +413,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Lasso"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Lasso"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -397,7 +428,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Lasso"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Lasso"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -416,7 +447,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Lasso"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Lasso"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -426,7 +457,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Move" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Move" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 168.0 @@ -436,7 +467,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Move"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -451,7 +482,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Move"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -470,7 +501,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Move"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -480,7 +511,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Zoom" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Zoom" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 196.0 @@ -490,7 +521,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Zoom"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -505,7 +536,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Zoom"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -524,7 +555,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Zoom"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -534,7 +565,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Pan" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Pan" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 224.0 @@ -544,7 +575,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Pan"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -559,7 +590,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Pan"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -578,7 +609,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Pan"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -588,7 +619,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ColorPicker" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="ColorPicker" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 252.0 @@ -598,7 +629,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/ColorPicker"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -613,7 +644,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/ColorPicker"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -632,7 +663,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/ColorPicker"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -642,7 +673,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Pencil" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Pencil" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 280.0 @@ -652,7 +683,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Pencil"] modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 margin_right = 12.0 @@ -666,7 +697,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Pencil"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -685,7 +716,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Pencil"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -695,7 +726,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Eraser" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Eraser" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 308.0 @@ -705,7 +736,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Eraser"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -720,7 +751,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Eraser"] modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 margin_left = 24.0 @@ -738,7 +769,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Eraser"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -748,7 +779,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Bucket" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Bucket" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 336.0 @@ -758,7 +789,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Bucket"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -773,7 +804,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Bucket"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -792,7 +823,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Bucket"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -802,7 +833,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Shading" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Shading" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 364.0 @@ -812,7 +843,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Shading"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -827,7 +858,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Shading"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -846,7 +877,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/Shading"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -856,7 +887,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LineTool" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="LineTool" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 392.0 @@ -866,7 +897,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/LineTool"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -881,7 +912,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/LineTool"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -900,7 +931,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/LineTool"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -910,7 +941,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="RectangleTool" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="RectangleTool" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 420.0 @@ -920,7 +951,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/RectangleTool"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -935,7 +966,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/RectangleTool"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -954,7 +985,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/RectangleTool"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -964,7 +995,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="EllipseTool" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="EllipseTool" type="Button" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 448.0 @@ -974,7 +1005,7 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/EllipseTool"] visible = false modulate = Color( 0, 0.52549, 0.811765, 1 ) anchor_bottom = 1.0 @@ -989,7 +1020,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/EllipseTool"] visible = false modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) anchor_bottom = 1.0 @@ -1008,7 +1039,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons/EllipseTool"] margin_left = 1.0 margin_top = 1.0 margin_right = 23.0 @@ -1019,27 +1050,28 @@ __meta__ = { } [node name="CanvasAndTimeline" type="VSplitContainer" parent="ToolsAndCanvas"] -margin_left = 60.0 -margin_right = 950.0 +margin_left = 50.0 +margin_right = 946.0 margin_bottom = 692.0 +rect_min_size = Vector2( 100, 0 ) size_flags_horizontal = 3 custom_constants/autohide = 0 [node name="ViewportAndRulers" type="VBoxContainer" parent="ToolsAndCanvas/CanvasAndTimeline"] -margin_right = 890.0 +margin_right = 896.0 margin_bottom = 480.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 [node name="TabsContainer" type="PanelContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers"] -margin_right = 890.0 +margin_right = 896.0 margin_bottom = 38.0 [node name="Tabs" type="Tabs" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer"] margin_left = 7.0 margin_top = 7.0 -margin_right = 883.0 +margin_right = 889.0 margin_bottom = 31.0 tab_align = 0 tab_close_display_policy = 1 @@ -1048,7 +1080,7 @@ script = ExtResource( 3 ) [node name="HorizontalRuler" type="Button" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers"] margin_top = 38.0 -margin_right = 890.0 +margin_right = 896.0 margin_bottom = 58.0 rect_min_size = Vector2( 0, 16 ) focus_mode = 0 @@ -1058,13 +1090,13 @@ script = ExtResource( 6 ) [node name="HSplitContainer" type="HSplitContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers"] margin_top = 58.0 -margin_right = 890.0 +margin_right = 896.0 margin_bottom = 480.0 size_flags_vertical = 3 custom_constants/autohide = 0 [node name="ViewportandVerticalRuler" type="HBoxContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] -margin_right = 878.0 +margin_right = 884.0 margin_bottom = 422.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -1083,7 +1115,7 @@ script = ExtResource( 4 ) [node name="ViewportContainer" type="ViewportContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_left = 16.0 -margin_right = 878.0 +margin_right = 884.0 margin_bottom = 422.0 focus_mode = 2 mouse_default_cursor_shape = 3 @@ -1093,7 +1125,7 @@ stretch = true script = ExtResource( 23 ) [node name="Viewport" type="Viewport" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] -size = Vector2( 862, 422 ) +size = Vector2( 868, 422 ) handle_input_locally = false usage = 0 render_target_update_mode = 3 @@ -1109,8 +1141,8 @@ zoom = Vector2( 0.15, 0.15 ) script = ExtResource( 7 ) [node name="ViewportContainer2" type="ViewportContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] -margin_left = 890.0 -margin_right = 890.0 +margin_left = 896.0 +margin_right = 896.0 margin_bottom = 422.0 size_flags_vertical = 3 stretch = true @@ -1133,7 +1165,7 @@ script = ExtResource( 7 ) [node name="AnimationTimeline" parent="ToolsAndCanvas/CanvasAndTimeline" instance=ExtResource( 18 )] margin_top = 492.0 -margin_right = 890.0 +margin_right = 896.0 margin_bottom = 692.0 custom_styles/panel = SubResource( 3 ) @@ -1152,43 +1184,50 @@ size_flags_vertical = 3 custom_constants/autohide = 0 [node name="RightPanel" type="Panel" parent="."] -margin_left = 950.0 +margin_left = 946.0 margin_right = 1280.0 margin_bottom = 692.0 -rect_min_size = Vector2( 330, 0 ) +rect_min_size = Vector2( 334, 0 ) -[node name="PreviewAndPalettes" type="VBoxContainer" parent="RightPanel"] +[node name="MarginContainer" type="MarginContainer" parent="RightPanel"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 16.0 -margin_right = 3.05176e-05 -margin_bottom = 6.10352e-05 +custom_constants/margin_right = 8 +custom_constants/margin_left = 8 +custom_constants/margin_bottom = 8 __meta__ = { "_edit_use_anchors_": false } -[node name="CanvasPreviewContainer" parent="RightPanel/PreviewAndPalettes" instance=ExtResource( 16 )] -margin_left = 15.0 -margin_right = 315.0 +[node name="PreviewAndPalettes" type="VBoxContainer" parent="RightPanel/MarginContainer"] +margin_left = 8.0 +margin_right = 336.0 +margin_bottom = 684.0 +custom_constants/separation = 8 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="ToolAndPaletteVSplit" type="VSplitContainer" parent="RightPanel/PreviewAndPalettes"] -margin_top = 168.0 -margin_right = 330.0 -margin_bottom = 676.0 +[node name="CanvasPreviewContainer" parent="RightPanel/MarginContainer/PreviewAndPalettes" instance=ExtResource( 16 )] + +[node name="ToolAndPaletteVSplit" type="VSplitContainer" parent="RightPanel/MarginContainer/PreviewAndPalettes"] +margin_top = 182.0 +margin_right = 328.0 +margin_bottom = 684.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/autohide = 0 -[node name="ColorAndToolOptions" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )] -margin_bottom = 378.0 +[node name="ColorAndToolOptions" parent="RightPanel/MarginContainer/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )] +margin_right = 328.0 +margin_bottom = 372.0 -[node name="PalettePanel" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 20 )] -margin_left = 15.0 -margin_top = 390.0 -margin_right = 315.0 -margin_bottom = 508.0 +[node name="PalettePanel" parent="RightPanel/MarginContainer/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 20 )] +margin_top = 384.0 +margin_right = 328.0 +margin_bottom = 502.0 -[connection signal="dragged" from="ToolsAndCanvas" to="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" method="_on_ToolsAndCanvas_dragged"] +[connection signal="dragged" from="ToolsAndCanvas" to="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" method="_on_ToolsAndCanvas_dragged"] [connection signal="reposition_active_tab_request" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_reposition_active_tab_request"] [connection signal="tab_changed" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_changed"] [connection signal="tab_close" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_close"] @@ -1199,4 +1238,4 @@ margin_bottom = 508.0 [connection signal="mouse_exited" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" method="_on_ViewportContainer_mouse_exited"] [connection signal="mouse_entered" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" method="_on_ViewportContainer_mouse_entered"] [connection signal="mouse_exited" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" method="_on_ViewportContainer_mouse_exited"] -[connection signal="dragged" from="ToolsAndCanvas/CanvasAndTimeline/TallscreenHSplitContainer" to="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" method="_on_ToolsAndCanvas_dragged"] +[connection signal="dragged" from="ToolsAndCanvas/CanvasAndTimeline/TallscreenHSplitContainer" to="ToolsAndCanvas/ToolPanel/MarginContainer/PanelContainer/ToolButtons" method="_on_ToolsAndCanvas_dragged"]