From 47fc6591706442ea3e185cb1172ba6fe1b2d3eb0 Mon Sep 17 00:00:00 2001 From: OverloadedOrama Date: Mon, 12 Feb 2024 05:02:07 +0200 Subject: [PATCH] Add yet another MarginContainer in the timeline To fix the outline of the first frame (when selected) from being cut off, while also keeping frames & cels glued to the layers --- src/UI/Timeline/AnimationTimeline.tscn | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn index 1d0fd044f..28543c8c4 100644 --- a/src/UI/Timeline/AnimationTimeline.tscn +++ b/src/UI/Timeline/AnimationTimeline.tscn @@ -837,7 +837,6 @@ layout_mode = 2 theme_override_constants/separation = 1 [node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/LayerContainer"] -editor_description = "Its entire purpose is to add a single pixel on the right of the opacity slider" layout_mode = 2 theme_override_constants/margin_left = 0 theme_override_constants/margin_top = 2 @@ -857,30 +856,37 @@ layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 0 -[node name="FrameScrollContainer" type="Container" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit" node_paths=PackedStringArray("h_scroll_bar")] +[node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit"] +layout_mode = 2 +theme_override_constants/margin_left = -2 +theme_override_constants/margin_top = 0 +theme_override_constants/margin_right = 0 +theme_override_constants/margin_bottom = 0 + +[node name="FrameScrollContainer" type="Container" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/MarginContainer" node_paths=PackedStringArray("h_scroll_bar")] unique_name_in_owner = true clip_contents = true layout_mode = 2 script = ExtResource("11") -h_scroll_bar = NodePath("../../../../BreakFreeFromContainer/FrameScrollBar") +h_scroll_bar = NodePath("../../../../../BreakFreeFromContainer/FrameScrollBar") -[node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer"] +[node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/MarginContainer/FrameScrollContainer"] layout_mode = 2 -theme_override_constants/margin_left = 0 +theme_override_constants/margin_left = 1 theme_override_constants/margin_top = 2 theme_override_constants/margin_right = 0 theme_override_constants/margin_bottom = 0 -[node name="FrameAndCelBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer/MarginContainer"] +[node name="FrameAndCelBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/MarginContainer/FrameScrollContainer/MarginContainer"] layout_mode = 2 theme_override_constants/separation = 0 -[node name="FrameHBox" type="HBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer/MarginContainer/FrameAndCelBox"] +[node name="FrameHBox" type="HBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/MarginContainer/FrameScrollContainer/MarginContainer/FrameAndCelBox"] custom_minimum_size = Vector2(0, 30) layout_mode = 2 theme_override_constants/separation = 0 -[node name="CelVBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer/MarginContainer/FrameAndCelBox"] +[node name="CelVBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/MarginContainer/FrameScrollContainer/MarginContainer/FrameAndCelBox"] layout_mode = 2 theme_override_constants/separation = 0