diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index a6a832e4a..4523b2218 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -219,9 +219,9 @@ func _ready() -> void: cursor_position_label = find_node_by_name(root, "CursorPosition") zoom_level_label = find_node_by_name(root, "ZoomLevel") - tool_panel = control.get_node("MenuAndUI/UI/ToolPanel") - right_panel = control.get_node("MenuAndUI/UI/RightPanel") - tabs_container = control.get_node("MenuAndUI/UI/CanvasAndTimeline/ViewportAndRulers/TabsContainer") + tool_panel = control.find_node("ToolPanel") + right_panel = control.find_node("RightPanel") + tabs_container = control.find_node("TabsContainer") recent_projects_submenu = PopupMenu.new() recent_projects_submenu.set_name("recent_projects_submenu") diff --git a/src/Main.gd b/src/Main.gd index 32660f105..949399943 100644 --- a/src/Main.gd +++ b/src/Main.gd @@ -5,13 +5,17 @@ var redone := false var is_quitting_on_save := false var tallscreen_is_active = false + onready var ui := $MenuAndUI/UI -onready var bottom_panel := $MenuAndUI/UI/CanvasAndTimeline/HBoxContainer/BottomPanel +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_panel := $MenuAndUI/UI/ToolPanel +onready var tool_panel := $MenuAndUI/UI/ToolsAndCanvas/ToolPanel onready var scroll_container := $MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer # Called when the node enters the scene tree for the first time. @@ -82,26 +86,28 @@ func change_ui_layout(mode : String) -> void: if mode == "tallscreen" and not tallscreen_is_active: tallscreen_is_active = true # changing visibility and re-parenting of nodes for tall screen - ui.get_node("CanvasAndTimeline/HBoxContainer").visible = true - reparent_node_to(Global.animation_timeline, ui.get_node("CanvasAndTimeline/HBoxContainer/BottomPanel"), 0) + tallscreen_hsplit_container.visible = true + 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 reparent_node_to(canvas_preview_container, tool_and_palette_vsplit, 1) tool_and_palette_vsplit = replace_node_with(tool_and_palette_vsplit, HBoxContainer.new()) color_and_tool_options.rect_min_size.x = 280 - reparent_node_to(tool_panel, ui.get_node("CanvasAndTimeline/HBoxContainer"), 0) + reparent_node_to(tool_panel, tallscreen_hsplit_container, 0) elif mode == "widescreen" and tallscreen_is_active: tallscreen_is_active = false # Reparenting and hiding nodes to adjust wide-screen - reparent_node_to(Global.animation_timeline, ui.get_node("CanvasAndTimeline"), 1) - ui.get_node("CanvasAndTimeline/HBoxContainer").visible = false + reparent_node_to(Global.animation_timeline, ui.get_node("ToolsAndCanvas/CanvasAndTimeline"), 1) + tallscreen_hsplit_container.visible = false + 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) 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, 0) + reparent_node_to(tool_panel, ui.find_node("ToolsAndCanvas"), 0) if get_viewport_rect().size.x < 908 and mode == "tallscreen": canvas_preview_container.visible = false diff --git a/src/UI/ToolButtons.gd b/src/UI/ToolButtons.gd index b3a2c8b79..972244540 100644 --- a/src/UI/ToolButtons.gd +++ b/src/UI/ToolButtons.gd @@ -1,4 +1,4 @@ -extends VBoxContainer +extends GridContainer # Node, shortcut @@ -45,3 +45,8 @@ func _on_Tool_pressed(tool_pressed : BaseButton) -> void: button = BUTTON_RIGHT if Input.is_action_just_released("right_mouse") else button if button != -1: 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) diff --git a/src/UI/TopMenuContainer.gd b/src/UI/TopMenuContainer.gd index fdb85d778..a1a1f1a64 100644 --- a/src/UI/TopMenuContainer.gd +++ b/src/UI/TopMenuContainer.gd @@ -360,7 +360,7 @@ func window_transparency(value :float) -> void: get_node("../../AlternateTransparentBackground").visible = false else: get_node("../../AlternateTransparentBackground").visible = true - var checker :ColorRect = get_parent().get_node("UI/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport/TransparentChecker") + var checker :ColorRect = get_parent().get_node("UI/ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport/TransparentChecker") var color :Color = Global.control.theme.get_stylebox("panel", "PanelContainer").bg_color color.a = value get_node("../../AlternateTransparentBackground").color = color @@ -424,7 +424,7 @@ func toggle_zen_mode() -> void: Global.tool_panel.visible = zen_mode Global.right_panel.visible = zen_mode Global.tabs_container.visible = zen_mode - Global.control.get_node("MenuAndUI/UI/CanvasAndTimeline/HBoxContainer").visible = zen_mode + Global.control.tallscreen_hsplit_container.visible = zen_mode zen_mode = !zen_mode view_menu.set_item_checked(ViewMenuId.ZEN_MODE, zen_mode) diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index 791f4c673..b39b05568 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -71,25 +71,26 @@ __meta__ = { "_edit_vertical_guides_": [ ] } -[node name="ToolPanel" type="Panel" parent="."] +[node name="ToolsAndCanvas" type="HSplitContainer" parent="."] +margin_right = 950.0 +margin_bottom = 692.0 +size_flags_horizontal = 3 + +[node name="ToolPanel" type="Panel" parent="ToolsAndCanvas"] margin_right = 48.0 margin_bottom = 692.0 rect_min_size = Vector2( 48, 0 ) size_flags_vertical = 3 -[node name="PanelContainer" type="PanelContainer" parent="ToolPanel"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -20.5 -margin_right = -6.5 -margin_bottom = 14.0 +[node name="PanelContainer" type="PanelContainer" parent="ToolsAndCanvas/ToolPanel"] +margin_left = 6.0 size_flags_horizontal = 0 size_flags_vertical = 0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolButtons" type="VBoxContainer" parent="ToolPanel/PanelContainer"] +[node name="ToolButtons" type="GridContainer" parent="ToolsAndCanvas/ToolPanel/PanelContainer"] margin_left = 7.0 margin_top = 7.0 margin_right = 39.0 @@ -97,11 +98,8 @@ margin_bottom = 507.0 size_flags_horizontal = 4 size_flags_vertical = 0 script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} -[node name="RectSelect" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="RectSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_right = 32.0 @@ -110,14 +108,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/RectSelect"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/RectSelect"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 12 ) @@ -125,7 +123,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ColorSelect" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="ColorSelect" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 36.0 @@ -135,14 +133,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 28 ) @@ -150,7 +148,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MagicWand" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="MagicWand" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 72.0 @@ -160,14 +158,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/MagicWand"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/MagicWand"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 29 ) @@ -175,7 +173,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Move" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Move" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 108.0 @@ -185,14 +183,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Move"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Move"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 26 ) @@ -200,7 +198,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Zoom" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Zoom" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 144.0 @@ -210,14 +208,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Zoom"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Zoom"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 21 ) @@ -225,7 +223,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Pan" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Pan" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 180.0 @@ -235,14 +233,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Pan"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Pan"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 22 ) @@ -250,7 +248,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ColorPicker" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="ColorPicker" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 216.0 @@ -260,14 +258,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 11 ) @@ -275,7 +273,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Pencil" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Pencil" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 252.0 @@ -285,7 +283,7 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Pencil"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 14 ) @@ -293,7 +291,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Pencil"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 8 ) @@ -301,7 +299,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Eraser" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Eraser" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 288.0 @@ -311,7 +309,7 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Eraser"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 27 ) @@ -319,7 +317,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Eraser"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 13 ) @@ -327,7 +325,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Bucket" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="Bucket" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 324.0 @@ -337,14 +335,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Bucket"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Bucket"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 10 ) @@ -352,7 +350,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LightenDarken" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="LightenDarken" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 360.0 @@ -362,14 +360,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/LightenDarken"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LightenDarken"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/LightenDarken"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LightenDarken"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 15 ) @@ -377,7 +375,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LineTool" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="LineTool" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 396.0 @@ -387,14 +385,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/LineTool"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/LineTool"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 30 ) @@ -402,7 +400,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="RectangleTool" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="RectangleTool" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 432.0 @@ -412,14 +410,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 24 ) @@ -427,7 +425,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="EllipseTool" type="Button" parent="ToolPanel/PanelContainer/ToolButtons" groups=[ +[node name="EllipseTool" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[ "UIButtons", ]] margin_top = 468.0 @@ -437,14 +435,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] margin_right = 32.0 margin_bottom = 32.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ToolIcon" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] margin_right = 32.0 margin_bottom = 32.0 texture = ExtResource( 25 ) @@ -452,38 +450,38 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CanvasAndTimeline" type="VSplitContainer" parent="."] -margin_left = 48.0 +[node name="CanvasAndTimeline" type="VSplitContainer" parent="ToolsAndCanvas"] +margin_left = 60.0 margin_right = 950.0 margin_bottom = 692.0 size_flags_horizontal = 3 custom_constants/autohide = 0 split_offset = 278 -[node name="ViewportAndRulers" type="VBoxContainer" parent="CanvasAndTimeline"] -margin_right = 902.0 +[node name="ViewportAndRulers" type="VBoxContainer" parent="ToolsAndCanvas/CanvasAndTimeline"] +margin_right = 890.0 margin_bottom = 480.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 -[node name="TabsContainer" type="PanelContainer" parent="CanvasAndTimeline/ViewportAndRulers"] -margin_right = 902.0 +[node name="TabsContainer" type="PanelContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers"] +margin_right = 890.0 margin_bottom = 38.0 -[node name="Tabs" type="Tabs" parent="CanvasAndTimeline/ViewportAndRulers/TabsContainer"] +[node name="Tabs" type="Tabs" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/TabsContainer"] margin_left = 7.0 margin_top = 7.0 -margin_right = 895.0 +margin_right = 883.0 margin_bottom = 31.0 tab_align = 0 tab_close_display_policy = 1 drag_to_rearrange_enabled = true script = ExtResource( 3 ) -[node name="HorizontalRuler" type="Button" parent="CanvasAndTimeline/ViewportAndRulers"] +[node name="HorizontalRuler" type="Button" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers"] margin_top = 38.0 -margin_right = 902.0 +margin_right = 890.0 margin_bottom = 58.0 rect_min_size = Vector2( 0, 16 ) focus_mode = 0 @@ -491,21 +489,21 @@ mouse_default_cursor_shape = 14 action_mode = 0 script = ExtResource( 6 ) -[node name="HSplitContainer" type="HSplitContainer" parent="CanvasAndTimeline/ViewportAndRulers"] +[node name="HSplitContainer" type="HSplitContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers"] margin_top = 58.0 -margin_right = 902.0 +margin_right = 890.0 margin_bottom = 480.0 size_flags_vertical = 3 custom_constants/autohide = 0 -[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] -margin_right = 890.0 +[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] +margin_right = 878.0 margin_bottom = 422.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 -[node name="VerticalRuler" type="Button" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] +[node name="VerticalRuler" type="Button" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_right = 16.0 margin_bottom = 422.0 rect_min_size = Vector2( 16, 0 ) @@ -516,9 +514,9 @@ size_flags_vertical = 3 action_mode = 0 script = ExtResource( 4 ) -[node name="ViewportContainer" type="ViewportContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] +[node name="ViewportContainer" type="ViewportContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_left = 16.0 -margin_right = 890.0 +margin_right = 878.0 margin_bottom = 422.0 focus_mode = 2 mouse_default_cursor_shape = 3 @@ -527,59 +525,60 @@ size_flags_vertical = 3 stretch = true script = ExtResource( 23 ) -[node name="Viewport" type="Viewport" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] -size = Vector2( 874, 422 ) +[node name="Viewport" type="Viewport" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] +size = Vector2( 862, 422 ) handle_input_locally = false usage = 0 render_target_update_mode = 3 -[node name="TransparentChecker" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 5 )] +[node name="TransparentChecker" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 5 )] material = SubResource( 1 ) -[node name="Canvas" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 19 )] +[node name="Canvas" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 19 )] -[node name="Camera2D" type="Camera2D" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"] +[node name="Camera2D" type="Camera2D" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) script = ExtResource( 7 ) -[node name="ViewportContainer2" type="ViewportContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] -margin_left = 902.0 -margin_right = 902.0 +[node name="ViewportContainer2" type="ViewportContainer" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] +margin_left = 890.0 +margin_right = 890.0 margin_bottom = 422.0 size_flags_vertical = 3 stretch = true script = ExtResource( 23 ) -[node name="Viewport" type="Viewport" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2"] +[node name="Viewport" type="Viewport" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2"] size = Vector2( 0, 422 ) handle_input_locally = false render_target_update_mode = 3 -[node name="TransparentChecker" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 5 )] +[node name="TransparentChecker" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 5 )] material = SubResource( 2 ) -[node name="CanvasPreview" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 2 )] +[node name="CanvasPreview" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 2 )] -[node name="Camera2D2" type="Camera2D" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport"] +[node name="Camera2D2" type="Camera2D" parent="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) script = ExtResource( 7 ) -[node name="AnimationTimeline" parent="CanvasAndTimeline" instance=ExtResource( 18 )] +[node name="AnimationTimeline" parent="ToolsAndCanvas/CanvasAndTimeline" instance=ExtResource( 18 )] margin_top = 492.0 +margin_right = 890.0 margin_bottom = 692.0 size_flags_vertical = 3 custom_styles/panel = SubResource( 3 ) -[node name="HBoxContainer" type="HBoxContainer" parent="CanvasAndTimeline"] +[node name="TallscreenHSplitContainer" type="HSplitContainer" parent="ToolsAndCanvas/CanvasAndTimeline"] visible = false margin_top = 492.0 margin_right = 902.0 margin_bottom = 692.0 size_flags_horizontal = 3 -[node name="BottomPanel" type="VSplitContainer" parent="CanvasAndTimeline/HBoxContainer"] +[node name="BottomPanel" type="VSplitContainer" parent="ToolsAndCanvas/CanvasAndTimeline/TallscreenHSplitContainer"] margin_right = 902.0 margin_bottom = 200.0 size_flags_horizontal = 3 @@ -623,13 +622,15 @@ margin_top = 260.0 margin_right = 315.0 margin_bottom = 508.0 -[connection signal="reposition_active_tab_request" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_reposition_active_tab_request"] -[connection signal="tab_changed" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_changed"] -[connection signal="tab_close" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_close"] -[connection signal="mouse_entered" from="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" to="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_mouse_entered"] -[connection signal="pressed" from="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" to="CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"] -[connection signal="pressed" from="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" to="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"] -[connection signal="mouse_entered" from="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" method="_on_ViewportContainer_mouse_entered"] -[connection signal="mouse_exited" from="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" method="_on_ViewportContainer_mouse_exited"] -[connection signal="mouse_entered" from="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" to="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" method="_on_ViewportContainer_mouse_entered"] -[connection signal="mouse_exited" from="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" to="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2" method="_on_ViewportContainer_mouse_exited"] +[connection signal="dragged" from="ToolsAndCanvas" to="ToolsAndCanvas/ToolPanel/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"] +[connection signal="mouse_entered" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_mouse_entered"] +[connection signal="pressed" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"] +[connection signal="pressed" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"] +[connection signal="mouse_entered" from="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="ToolsAndCanvas/CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" method="_on_ViewportContainer_mouse_entered"] +[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"]