diff --git a/assets/layouts/default.tres b/assets/layouts/default.tres index 12e1e4047..be0fe1466 100644 --- a/assets/layouts/default.tres +++ b/assets/layouts/default.tres @@ -1,145 +1,175 @@ -[gd_resource type="Resource" load_steps=23 format=2] +[gd_resource type="Resource" load_steps=27 format=2] -[ext_resource path="res://addons/dockable_container/layout.gd" type="Script" id=1] -[ext_resource path="res://addons/dockable_container/layout_panel.gd" type="Script" id=2] -[ext_resource path="res://addons/dockable_container/layout_split.gd" type="Script" id=3] +[ext_resource path="res://addons/dockable_container/layout_panel.gd" type="Script" id=1] +[ext_resource path="res://addons/dockable_container/layout_split.gd" type="Script" id=2] +[ext_resource path="res://addons/dockable_container/layout.gd" type="Script" id=3] [sub_resource type="Resource" id=1] resource_name = "Tabs" -script = ExtResource( 2 ) +script = ExtResource( 1 ) names = PoolStringArray( "Tools" ) current_tab = 0 -[sub_resource type="Resource" id=8] +[sub_resource type="Resource" id=2] resource_name = "Tabs" -script = ExtResource( 2 ) +script = ExtResource( 1 ) names = PoolStringArray( "Main Canvas" ) current_tab = 0 -[sub_resource type="Resource" id=28] +[sub_resource type="Resource" id=3] resource_name = "Tabs" +script = ExtResource( 1 ) +names = PoolStringArray( "Perspective Editor" ) +current_tab = 0 + +[sub_resource type="Resource" id=4] +resource_name = "Split" script = ExtResource( 2 ) +direction = 0 +percent = 0.5 +first = SubResource( 2 ) +second = SubResource( 3 ) + +[sub_resource type="Resource" id=5] +resource_name = "Tabs" +script = ExtResource( 1 ) names = PoolStringArray( "Second Canvas" ) current_tab = 0 -[sub_resource type="Resource" id=29] +[sub_resource type="Resource" id=6] resource_name = "Split" -script = ExtResource( 3 ) +script = ExtResource( 2 ) direction = 0 percent = 0.980952 -first = SubResource( 8 ) -second = SubResource( 28 ) +first = SubResource( 4 ) +second = SubResource( 5 ) -[sub_resource type="Resource" id=9] +[sub_resource type="Resource" id=7] resource_name = "Tabs" -script = ExtResource( 2 ) +script = ExtResource( 1 ) names = PoolStringArray( "Animation Timeline" ) current_tab = 0 -[sub_resource type="Resource" id=10] +[sub_resource type="Resource" id=8] resource_name = "Split" -script = ExtResource( 3 ) +script = ExtResource( 2 ) direction = 1 percent = 0.90625 -first = SubResource( 29 ) -second = SubResource( 9 ) +first = SubResource( 6 ) +second = SubResource( 7 ) -[sub_resource type="Resource" id=11] +[sub_resource type="Resource" id=9] resource_name = "Tabs" -script = ExtResource( 2 ) +script = ExtResource( 1 ) names = PoolStringArray( "Canvas Preview", "Reference Images" ) current_tab = 0 -[sub_resource type="Resource" id=20] +[sub_resource type="Resource" id=10] resource_name = "Tabs" -script = ExtResource( 2 ) +script = ExtResource( 1 ) names = PoolStringArray( "Color Pickers" ) current_tab = 0 -[sub_resource type="Resource" id=30] +[sub_resource type="Resource" id=11] resource_name = "Tabs" -script = ExtResource( 2 ) +script = ExtResource( 1 ) names = PoolStringArray( "Global Tool Options" ) current_tab = 0 -[sub_resource type="Resource" id=31] -resource_name = "Split" -script = ExtResource( 3 ) -direction = 1 -percent = 0.5 -first = SubResource( 20 ) -second = SubResource( 30 ) - -[sub_resource type="Resource" id=21] -resource_name = "Split" -script = ExtResource( 3 ) -direction = 1 -percent = 0.911765 -first = SubResource( 11 ) -second = SubResource( 31 ) - -[sub_resource type="Resource" id=22] +[sub_resource type="Resource" id=12] resource_name = "Tabs" -script = ExtResource( 2 ) -names = PoolStringArray( "Left Tool Options" ) +script = ExtResource( 1 ) +names = PoolStringArray( "Recorder" ) current_tab = 0 -[sub_resource type="Resource" id=23] -resource_name = "Tabs" -script = ExtResource( 2 ) -names = PoolStringArray( "Right Tool Options" ) -current_tab = 0 - -[sub_resource type="Resource" id=24] -resource_name = "Split" -script = ExtResource( 3 ) -direction = 0 -percent = 0.5 -first = SubResource( 22 ) -second = SubResource( 23 ) - [sub_resource type="Resource" id=13] -resource_name = "Tabs" +resource_name = "Split" script = ExtResource( 2 ) -names = PoolStringArray( "Palettes" ) -current_tab = 0 +direction = 1 +percent = 0.5 +first = SubResource( 11 ) +second = SubResource( 12 ) [sub_resource type="Resource" id=14] resource_name = "Split" -script = ExtResource( 3 ) +script = ExtResource( 2 ) direction = 1 -percent = 0.7 -first = SubResource( 24 ) +percent = 0.5 +first = SubResource( 10 ) second = SubResource( 13 ) [sub_resource type="Resource" id=15] resource_name = "Split" -script = ExtResource( 3 ) +script = ExtResource( 2 ) direction = 1 -percent = 0.332031 -first = SubResource( 21 ) +percent = 0.911765 +first = SubResource( 9 ) second = SubResource( 14 ) [sub_resource type="Resource" id=16] -resource_name = "Split" -script = ExtResource( 3 ) -direction = 0 -percent = 0.72 -first = SubResource( 10 ) -second = SubResource( 15 ) +resource_name = "Tabs" +script = ExtResource( 1 ) +names = PoolStringArray( "Left Tool Options" ) +current_tab = 0 -[sub_resource type="Resource" id=5] +[sub_resource type="Resource" id=17] +resource_name = "Tabs" +script = ExtResource( 1 ) +names = PoolStringArray( "Right Tool Options" ) +current_tab = 0 + +[sub_resource type="Resource" id=18] resource_name = "Split" -script = ExtResource( 3 ) +script = ExtResource( 2 ) +direction = 0 +percent = 0.5 +first = SubResource( 16 ) +second = SubResource( 17 ) + +[sub_resource type="Resource" id=19] +resource_name = "Tabs" +script = ExtResource( 1 ) +names = PoolStringArray( "Palettes" ) +current_tab = 0 + +[sub_resource type="Resource" id=20] +resource_name = "Split" +script = ExtResource( 2 ) +direction = 1 +percent = 0.692661 +first = SubResource( 18 ) +second = SubResource( 19 ) + +[sub_resource type="Resource" id=21] +resource_name = "Split" +script = ExtResource( 2 ) +direction = 1 +percent = 0.332031 +first = SubResource( 15 ) +second = SubResource( 20 ) + +[sub_resource type="Resource" id=22] +resource_name = "Split" +script = ExtResource( 2 ) +direction = 0 +percent = 0.727569 +first = SubResource( 8 ) +second = SubResource( 21 ) + +[sub_resource type="Resource" id=23] +resource_name = "Split" +script = ExtResource( 2 ) direction = 0 percent = 0.0 first = SubResource( 1 ) -second = SubResource( 16 ) +second = SubResource( 22 ) [resource] resource_name = "Layout" -script = ExtResource( 1 ) -root = SubResource( 5 ) +script = ExtResource( 3 ) +root = SubResource( 23 ) hidden_tabs = { +"Perspective Editor": true, +"Recorder": true, "Second Canvas": true } diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index a66570395..e8bcb8d0a 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=50 format=2] +[gd_scene load_steps=54 format=2] [ext_resource path="res://src/UI/Tools/Tools.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=2] @@ -36,7 +36,7 @@ shader_param/size = Vector2( 100, 100 ) [sub_resource type="Resource" id=1] resource_name = "Tabs" script = ExtResource( 36 ) -names = PoolStringArray( "Tools", "Perspective Editor", "Recorder" ) +names = PoolStringArray( "Tools" ) current_tab = 0 [sub_resource type="Resource" id=8] @@ -45,6 +45,20 @@ script = ExtResource( 36 ) names = PoolStringArray( "Main Canvas" ) current_tab = 0 +[sub_resource type="Resource" id=33] +resource_name = "Tabs" +script = ExtResource( 36 ) +names = PoolStringArray( "Perspective Editor" ) +current_tab = 0 + +[sub_resource type="Resource" id=34] +resource_name = "Split" +script = ExtResource( 27 ) +direction = 0 +percent = 0.5 +first = SubResource( 8 ) +second = SubResource( 33 ) + [sub_resource type="Resource" id=28] resource_name = "Tabs" script = ExtResource( 36 ) @@ -56,7 +70,7 @@ resource_name = "Split" script = ExtResource( 27 ) direction = 0 percent = 0.980952 -first = SubResource( 8 ) +first = SubResource( 34 ) second = SubResource( 28 ) [sub_resource type="Resource" id=9] @@ -91,13 +105,27 @@ script = ExtResource( 36 ) names = PoolStringArray( "Global Tool Options" ) current_tab = 0 +[sub_resource type="Resource" id=35] +resource_name = "Tabs" +script = ExtResource( 36 ) +names = PoolStringArray( "Recorder" ) +current_tab = 0 + +[sub_resource type="Resource" id=36] +resource_name = "Split" +script = ExtResource( 27 ) +direction = 1 +percent = 0.5 +first = SubResource( 30 ) +second = SubResource( 35 ) + [sub_resource type="Resource" id=31] resource_name = "Split" script = ExtResource( 27 ) direction = 1 percent = 0.5 first = SubResource( 20 ) -second = SubResource( 30 ) +second = SubResource( 36 ) [sub_resource type="Resource" id=21] resource_name = "Split" @@ -165,11 +193,13 @@ percent = 0.0 first = SubResource( 1 ) second = SubResource( 16 ) -[sub_resource type="Resource" id=32] +[sub_resource type="Resource" id=37] resource_name = "Layout" script = ExtResource( 14 ) root = SubResource( 5 ) hidden_tabs = { +"Perspective Editor": true, +"Recorder": true, "Second Canvas": true } @@ -215,7 +245,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource( 35 ) tabs_visible = false -layout = SubResource( 32 ) +layout = SubResource( 37 ) [node name="Tools" parent="DockableContainer" instance=ExtResource( 1 )] margin_left = 4.0 @@ -226,20 +256,20 @@ margin_bottom = -4.0 [node name="Main Canvas" type="VBoxContainer" parent="DockableContainer"] margin_left = 60.0 margin_top = 8.0 -margin_right = 1063.0 +margin_right = 977.0 margin_bottom = 642.5 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 [node name="TabsContainer" type="PanelContainer" parent="DockableContainer/Main Canvas"] -margin_right = 1003.0 +margin_right = 917.0 margin_bottom = 38.0 [node name="Tabs" type="Tabs" parent="DockableContainer/Main Canvas/TabsContainer"] margin_left = 7.0 margin_top = 7.0 -margin_right = 996.0 +margin_right = 910.0 margin_bottom = 31.0 tab_align = 0 tab_close_display_policy = 2 @@ -248,7 +278,7 @@ script = ExtResource( 3 ) [node name="HorizontalRuler" type="Button" parent="DockableContainer/Main Canvas"] margin_top = 38.0 -margin_right = 1003.0 +margin_right = 917.0 margin_bottom = 58.0 rect_min_size = Vector2( 0, 16 ) focus_mode = 0 @@ -259,7 +289,7 @@ script = ExtResource( 6 ) [node name="ViewportandVerticalRuler" type="HBoxContainer" parent="DockableContainer/Main Canvas"] margin_top = 58.0 -margin_right = 1003.0 +margin_right = 917.0 margin_bottom = 634.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -279,7 +309,7 @@ script = ExtResource( 4 ) [node name="ViewportContainer" type="ViewportContainer" parent="DockableContainer/Main Canvas/ViewportandVerticalRuler"] margin_left = 16.0 -margin_right = 1003.0 +margin_right = 917.0 margin_bottom = 576.0 focus_mode = 2 mouse_default_cursor_shape = 3 @@ -289,7 +319,7 @@ stretch = true script = ExtResource( 23 ) [node name="Viewport" type="Viewport" parent="DockableContainer/Main Canvas/ViewportandVerticalRuler/ViewportContainer"] -size = Vector2( 987, 576 ) +size = Vector2( 901, 576 ) handle_input_locally = false usage = 0 render_target_update_mode = 3 @@ -343,30 +373,30 @@ script = ExtResource( 7 ) [node name="Animation Timeline" parent="DockableContainer" instance=ExtResource( 18 )] margin_left = 60.0 margin_top = 666.5 -margin_right = 1063.0 +margin_right = 977.0 margin_bottom = 716.0 [node name="Canvas Preview" parent="DockableContainer" instance=ExtResource( 16 )] -margin_left = 1083.0 +margin_left = 997.0 margin_top = 8.0 margin_right = 1276.0 margin_bottom = 98.0 [node name="Color Pickers" parent="DockableContainer" instance=ExtResource( 17 )] -margin_left = 1083.0 +margin_left = 997.0 margin_top = 122.0 -margin_bottom = 168.0 +margin_bottom = 184.0 [node name="Global Tool Options" parent="DockableContainer" instance=ExtResource( 10 )] -margin_left = 1083.0 -margin_top = 192.0 +margin_left = 997.0 +margin_top = 208.0 margin_right = 1276.0 -margin_bottom = 242.0 +margin_bottom = 258.0 [node name="Left Tool Options" type="ScrollContainer" parent="DockableContainer"] -margin_left = 1083.0 -margin_top = 266.0 -margin_right = 1169.5 +margin_left = 997.0 +margin_top = 282.0 +margin_right = 1126.5 margin_bottom = 592.0 rect_min_size = Vector2( 72, 72 ) __meta__ = { @@ -375,47 +405,50 @@ __meta__ = { [node name="LeftPanelContainer" type="PanelContainer" parent="DockableContainer/Left Tool Options"] margin_right = 130.0 -margin_bottom = 314.0 +margin_bottom = 298.0 rect_min_size = Vector2( 130, 0 ) size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Right Tool Options" type="ScrollContainer" parent="DockableContainer"] -margin_left = 1189.5 -margin_top = 266.0 +margin_left = 1146.5 +margin_top = 282.0 margin_right = 1276.0 margin_bottom = 592.0 rect_min_size = Vector2( 72, 72 ) [node name="RightPanelContainer" type="PanelContainer" parent="DockableContainer/Right Tool Options"] margin_right = 130.0 -margin_bottom = 314.0 +margin_bottom = 298.0 rect_min_size = Vector2( 130, 0 ) size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Palettes" parent="DockableContainer" instance=ExtResource( 20 )] -margin_left = 1083.0 +margin_left = 997.0 margin_top = 616.0 margin_right = 1276.0 margin_bottom = 716.0 [node name="Reference Images" parent="DockableContainer" instance=ExtResource( 11 )] visible = false -margin_left = 1079.0 -margin_right = -80.0 +margin_left = 993.0 +margin_right = -166.0 margin_bottom = -684.0 [node name="Perspective Editor" parent="DockableContainer" instance=ExtResource( 12 )] visible = false -margin_right = -1010.0 -margin_bottom = -710.0 +margin_left = 528.5 +margin_top = 8.0 +margin_right = -303.0 +margin_bottom = -77.5 [node name="Recorder" parent="DockableContainer" instance=ExtResource( 13 )] visible = false -margin_left = 0.0 -margin_right = 14.0 -margin_bottom = 36.0 +margin_left = 997.0 +margin_top = 282.0 +margin_right = 1276.0 +margin_bottom = 332.0 [connection signal="item_rect_changed" from="DockableContainer/Main Canvas" to="." method="_on_main_canvas_item_rect_changed"] [connection signal="visibility_changed" from="DockableContainer/Main Canvas" to="." method="_on_main_canvas_visibility_changed"]