From 1285fa89c58846c702ce63482e9e7296beb9b3e6 Mon Sep 17 00:00:00 2001 From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com> Date: Thu, 10 Feb 2022 19:15:57 +0200 Subject: [PATCH] Added a Scrollcontainer in the timeline This fixes the issue with the timeline UI nodes affecting the rest of the panels if the timeline becomes too small. Kind of an ugly fix because there can now be two scrollbars visible if there are many frames, eventually we may need to redesign the timeline. --- src/UI/Timeline/AnimationTimeline.tscn | 207 +++++++++++++------------ 1 file changed, 109 insertions(+), 98 deletions(-) diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn index dd941cb7f..347792f7b 100644 --- a/src/UI/Timeline/AnimationTimeline.tscn +++ b/src/UI/Timeline/AnimationTimeline.tscn @@ -112,25 +112,33 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="TimelineContainer" type="VBoxContainer" parent="."] +[node name="ScrollContainer" type="ScrollContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -size_flags_horizontal = 3 __meta__ = { "_edit_use_anchors_": false } -[node name="TimelineButtons" type="HBoxContainer" parent="TimelineContainer"] +[node name="TimelineContainer" type="VBoxContainer" parent="ScrollContainer"] +margin_right = 902.0 +margin_bottom = 160.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TimelineButtons" type="HBoxContainer" parent="ScrollContainer/TimelineContainer"] margin_right = 902.0 margin_bottom = 38.0 size_flags_horizontal = 3 -[node name="LayerButtonPanelContainer" type="PanelContainer" parent="TimelineContainer/TimelineButtons"] +[node name="LayerButtonPanelContainer" type="PanelContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons"] margin_right = 186.0 margin_bottom = 38.0 custom_styles/panel = SubResource( 2 ) -[node name="LayerButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer"] +[node name="LayerButtons" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer"] margin_left = 4.5 margin_top = 3.0 margin_right = 181.5 @@ -138,7 +146,7 @@ margin_bottom = 25.0 size_flags_vertical = 0 custom_constants/separation = 9 -[node name="AddLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] +[node name="AddLayer" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] margin_right = 22.0 margin_bottom = 22.0 rect_min_size = Vector2( 22, 22 ) @@ -146,7 +154,7 @@ hint_tooltip = "Create a new layer" focus_mode = 0 mouse_default_cursor_shape = 2 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -162,7 +170,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="RemoveLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] +[node name="RemoveLayer" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] margin_left = 31.0 margin_right = 53.0 margin_bottom = 22.0 @@ -172,7 +180,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -188,7 +196,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveUpLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] +[node name="MoveUpLayer" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] margin_left = 62.0 margin_right = 84.0 margin_bottom = 22.0 @@ -198,7 +206,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -214,7 +222,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] +[node name="MoveDownLayer" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] margin_left = 93.0 margin_right = 115.0 margin_bottom = 22.0 @@ -224,7 +232,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -240,7 +248,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CloneLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] +[node name="CloneLayer" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] margin_left = 124.0 margin_right = 146.0 margin_bottom = 22.0 @@ -249,7 +257,7 @@ hint_tooltip = "Clone current layer" focus_mode = 0 mouse_default_cursor_shape = 2 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -265,7 +273,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MergeDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] +[node name="MergeDownLayer" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]] margin_left = 155.0 margin_right = 177.0 margin_bottom = 22.0 @@ -275,7 +283,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -291,18 +299,18 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Control" type="Control" parent="TimelineContainer/TimelineButtons"] +[node name="Control" type="Control" parent="ScrollContainer/TimelineContainer/TimelineButtons"] margin_left = 190.0 margin_right = 386.0 margin_bottom = 38.0 size_flags_horizontal = 3 -[node name="PanelContainer" type="PanelContainer" parent="TimelineContainer/TimelineButtons"] +[node name="PanelContainer" type="PanelContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons"] margin_left = 390.0 margin_right = 902.0 margin_bottom = 38.0 -[node name="AnimationButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/PanelContainer"] +[node name="AnimationButtons" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer"] margin_left = 7.0 margin_top = 7.0 margin_right = 505.0 @@ -311,12 +319,15 @@ rect_min_size = Vector2( 0, 24 ) size_flags_horizontal = 3 custom_constants/separation = 40 alignment = 2 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="FrameButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] +[node name="FrameButtons" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] margin_right = 140.0 margin_bottom = 24.0 -[node name="AddFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] +[node name="AddFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] margin_top = 2.0 margin_right = 20.0 margin_bottom = 22.0 @@ -327,7 +338,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -341,7 +352,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="DeleteFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] +[node name="DeleteFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] margin_left = 24.0 margin_top = 2.0 margin_right = 44.0 @@ -353,7 +364,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -369,7 +380,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CopyFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] +[node name="CopyFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] margin_left = 48.0 margin_top = 2.0 margin_right = 68.0 @@ -381,7 +392,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -395,7 +406,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="FrameTagButton" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] +[node name="FrameTagButton" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] margin_left = 72.0 margin_top = 2.0 margin_right = 92.0 @@ -407,7 +418,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -421,7 +432,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveLeft" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] +[node name="MoveLeft" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] margin_left = 96.0 margin_top = 2.0 margin_right = 116.0 @@ -433,7 +444,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -448,7 +459,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveRight" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] +[node name="MoveRight" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]] margin_left = 120.0 margin_top = 2.0 margin_right = 140.0 @@ -460,7 +471,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -474,12 +485,12 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlaybackButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] +[node name="PlaybackButtons" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] margin_left = 180.0 margin_right = 320.0 margin_bottom = 24.0 -[node name="FirstFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] +[node name="FirstFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] margin_top = 2.0 margin_right = 20.0 margin_bottom = 22.0 @@ -492,7 +503,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 4 ) -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -506,7 +517,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PreviousFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] +[node name="PreviousFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] margin_left = 24.0 margin_top = 2.0 margin_right = 44.0 @@ -520,7 +531,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 6 ) -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -534,7 +545,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlayBackwards" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] +[node name="PlayBackwards" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] margin_left = 48.0 margin_top = 2.0 margin_right = 68.0 @@ -549,7 +560,7 @@ toggle_mode = true shortcut_in_tooltip = false shortcut = SubResource( 8 ) -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -563,7 +574,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlayForward" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] +[node name="PlayForward" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] margin_left = 72.0 margin_top = 2.0 margin_right = 92.0 @@ -579,7 +590,7 @@ toggle_mode = true shortcut_in_tooltip = false shortcut = SubResource( 10 ) -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -593,7 +604,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="NextFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] +[node name="NextFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] margin_left = 96.0 margin_top = 2.0 margin_right = 116.0 @@ -607,7 +618,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 12 ) -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -621,7 +632,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LastFrame" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] +[node name="LastFrame" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]] margin_left = 120.0 margin_top = 2.0 margin_right = 140.0 @@ -635,7 +646,7 @@ size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 14 ) -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -649,12 +660,12 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LoopButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] +[node name="LoopButtons" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons"] margin_left = 360.0 margin_right = 498.0 margin_bottom = 24.0 -[node name="OnionSkinningSettings" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]] +[node name="OnionSkinningSettings" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]] margin_top = 2.0 margin_right = 12.0 margin_bottom = 22.0 @@ -664,7 +675,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -680,7 +691,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="OnionSkinning" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]] +[node name="OnionSkinning" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]] margin_left = 16.0 margin_top = 2.0 margin_right = 36.0 @@ -691,7 +702,7 @@ focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -707,7 +718,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LoopAnim" type="Button" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]] +[node name="LoopAnim" type="Button" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]] margin_left = 40.0 margin_top = 2.0 margin_right = 60.0 @@ -718,7 +729,7 @@ focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -732,7 +743,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="FPSValue" type="SpinBox" parent="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons"] +[node name="FPSValue" type="SpinBox" parent="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons"] margin_left = 64.0 margin_right = 138.0 margin_bottom = 24.0 @@ -746,24 +757,24 @@ value = 6.0 align = 1 suffix = "FPS" -[node name="OpacityAndTagContainer" type="HBoxContainer" parent="TimelineContainer"] +[node name="OpacityAndTagContainer" type="HBoxContainer" parent="ScrollContainer/TimelineContainer"] margin_top = 42.0 margin_right = 902.0 margin_bottom = 74.0 custom_constants/separation = 2 -[node name="SpacerControl" type="Control" parent="TimelineContainer/OpacityAndTagContainer"] +[node name="SpacerControl" type="Control" parent="ScrollContainer/TimelineContainer/OpacityAndTagContainer"] margin_right = 4.0 margin_bottom = 32.0 rect_min_size = Vector2( 4, 0 ) -[node name="OpacityContainer" type="HBoxContainer" parent="TimelineContainer/OpacityAndTagContainer"] +[node name="OpacityContainer" type="HBoxContainer" parent="ScrollContainer/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="TimelineContainer/OpacityAndTagContainer/OpacityContainer"] +[node name="OpacityLabel" type="Label" parent="ScrollContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] margin_top = 9.0 margin_right = 53.0 margin_bottom = 23.0 @@ -771,7 +782,7 @@ size_flags_horizontal = 0 text = "Opacity:" valign = 1 -[node name="OpacitySlider" type="HSlider" parent="TimelineContainer/OpacityAndTagContainer/OpacityContainer"] +[node name="OpacitySlider" type="HSlider" parent="ScrollContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] margin_left = 57.0 margin_top = 8.0 margin_right = 102.0 @@ -783,7 +794,7 @@ size_flags_vertical = 4 value = 100.0 ticks_on_borders = true -[node name="OpacitySpinBox" type="SpinBox" parent="TimelineContainer/OpacityAndTagContainer/OpacityContainer"] +[node name="OpacitySpinBox" type="SpinBox" parent="ScrollContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer"] margin_left = 106.0 margin_top = 4.0 margin_right = 180.0 @@ -793,13 +804,13 @@ size_flags_vertical = 4 value = 100.0 align = 1 -[node name="SpacerControl2" type="Control" parent="TimelineContainer/OpacityAndTagContainer"] +[node name="SpacerControl2" type="Control" parent="ScrollContainer/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="TimelineContainer/OpacityAndTagContainer"] +[node name="TagScroll" type="ScrollContainer" parent="ScrollContainer/TimelineContainer/OpacityAndTagContainer"] margin_left = 219.0 margin_right = 902.0 margin_bottom = 32.0 @@ -809,30 +820,30 @@ size_flags_horizontal = 3 theme = SubResource( 20 ) scroll_vertical_enabled = false -[node name="TagContainer" type="Control" parent="TimelineContainer/OpacityAndTagContainer/TagScroll"] +[node name="TagContainer" type="Control" parent="ScrollContainer/TimelineContainer/OpacityAndTagContainer/TagScroll"] -[node name="PanelContainer" type="PanelContainer" parent="TimelineContainer"] +[node name="PanelContainer" type="PanelContainer" parent="ScrollContainer/TimelineContainer"] margin_top = 78.0 margin_right = 902.0 margin_bottom = 160.0 size_flags_vertical = 3 -[node name="TimelineScroll" type="ScrollContainer" parent="TimelineContainer/PanelContainer"] +[node name="TimelineScroll" type="ScrollContainer" parent="ScrollContainer/TimelineContainer/PanelContainer"] margin_left = 7.0 margin_top = 7.0 margin_right = 895.0 margin_bottom = 75.0 -[node name="LayersAndFrames" type="HBoxContainer" parent="TimelineContainer/PanelContainer/TimelineScroll"] +[node name="LayersAndFrames" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll"] margin_right = 252.0 margin_bottom = 68.0 size_flags_vertical = 3 -[node name="LayerVBoxCont" type="VBoxContainer" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] +[node name="LayerVBoxCont" type="VBoxContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] margin_right = 212.0 margin_bottom = 68.0 -[node name="LayerLabel" type="Label" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] +[node name="LayerLabel" type="Label" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] margin_right = 212.0 margin_bottom = 16.0 rect_min_size = Vector2( 0, 16 ) @@ -840,29 +851,29 @@ text = "Layers" align = 1 valign = 1 -[node name="LayersContainer" type="VBoxContainer" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] +[node name="LayersContainer" type="VBoxContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] margin_top = 20.0 margin_right = 212.0 margin_bottom = 56.0 -[node name="LayerContainer" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont/LayersContainer" instance=ExtResource( 18 )] +[node name="LayerContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont/LayersContainer" instance=ExtResource( 18 )] margin_right = 212.0 -[node name="FrameButtonsAndIds" type="VBoxContainer" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] +[node name="FrameButtonsAndIds" type="VBoxContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames"] margin_left = 216.0 margin_right = 252.0 margin_bottom = 68.0 -[node name="FrameIDs" type="HBoxContainer" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] +[node name="FrameIDs" type="HBoxContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] margin_right = 36.0 margin_bottom = 20.0 rect_min_size = Vector2( 0, 16 ) -[node name="FrameButton" parent="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds/FrameIDs" instance=ExtResource( 9 )] +[node name="FrameButton" parent="ScrollContainer/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="TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] +[node name="FramesContainer" type="VBoxContainer" parent="ScrollContainer/TimelineContainer/PanelContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] margin_top = 24.0 margin_right = 36.0 margin_bottom = 24.0 @@ -981,30 +992,30 @@ autowrap = true [node name="FrameTagDialog" parent="." instance=ExtResource( 42 )] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer" to="." method="add_layer" binds= [ true ]] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft" to="." method="_on_MoveLeft_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight" to="." method="_on_MoveRight_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] -[connection signal="toggled" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] -[connection signal="toggled" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] -[connection signal="pressed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] -[connection signal="value_changed" from="TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] -[connection signal="value_changed" from="TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] -[connection signal="value_changed" from="TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySpinBox" to="." method="_on_OpacitySlider_value_changed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/AddLayer" to="." method="add_layer" binds= [ true ]] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveLeft" to="." method="_on_MoveLeft_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons/MoveRight" to="." method="_on_MoveRight_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] +[connection signal="toggled" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] +[connection signal="toggled" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] +[connection signal="pressed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] +[connection signal="value_changed" from="ScrollContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] +[connection signal="value_changed" from="ScrollContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] +[connection signal="value_changed" from="ScrollContainer/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"]