From f4dbd2aadb140ec137a2a925baed0d1c8a00dac8 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Mon, 9 Mar 2020 01:53:20 +0200
Subject: [PATCH] Add a VSplitContainer between the canvas and the timeline

---
 Changelog.md |  3 +++
 Main.tscn    | 25 ++++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c0f40d072..e0d049065 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,11 +10,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - A confirmation message now appears when the user quits Pixelorama, if there are unsaved changes - thanks to Schweini07!
 
 ### Changed
+- The timeline has been revamped!
 - An asterisk is added to the window title if there are unsaved changes.
+- A VSplitContainer has been added between the canvas and the timeline.
 - Notification text is now black on the gold and light themes.
 
 ### Fixed
 - Chinese characters not being rendered in notifications (the labels that appear when undoing/redoing)
+- Fixed issue when moving frames, the current frame was being shown but the frame next to it was actually the one being drawn on.
 
 ## [v0.6.2] - 17-02-2020
 
diff --git a/Main.tscn b/Main.tscn
index e47b58c84..6fc13d16e 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -919,22 +919,22 @@ hint_tooltip = "VERTMIRROR_HT"
 mouse_default_cursor_shape = 2
 text = "Vertical"
 
-[node name="CanvasAndTimeline" type="VBoxContainer" parent="MenuAndUI/UI"]
+[node name="CanvasAndTimeline" type="VSplitContainer" parent="MenuAndUI/UI"]
 margin_left = 224.0
 margin_right = 928.0
 margin_bottom = 620.0
 size_flags_horizontal = 3
-custom_constants/separation = 0
+custom_constants/autohide = 0
 
 [node name="HViewportContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline"]
 margin_right = 704.0
-margin_bottom = 420.0
+margin_bottom = 408.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="ViewportAndRulers" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"]
 margin_right = 704.0
-margin_bottom = 420.0
+margin_bottom = 408.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/separation = 0
@@ -955,20 +955,20 @@ script = ExtResource( 14 )
 [node name="HSplitContainer" type="HSplitContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"]
 margin_top = 16.0
 margin_right = 704.0
-margin_bottom = 420.0
+margin_bottom = 408.0
 size_flags_vertical = 3
 custom_constants/autohide = 0
 
 [node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"]
 margin_right = 692.0
-margin_bottom = 404.0
+margin_bottom = 392.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/separation = 0
 
 [node name="VerticalRuler" type="Button" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"]
 margin_right = 16.0
-margin_bottom = 404.0
+margin_bottom = 392.0
 rect_min_size = Vector2( 16, 0 )
 focus_mode = 0
 mouse_default_cursor_shape = 15
@@ -985,13 +985,13 @@ script = ExtResource( 15 )
 [node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"]
 margin_left = 16.0
 margin_right = 692.0
-margin_bottom = 404.0
+margin_bottom = 392.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 stretch = true
 
 [node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"]
-size = Vector2( 676, 404 )
+size = Vector2( 676, 392 )
 handle_input_locally = false
 usage = 0
 render_target_update_mode = 3
@@ -1015,12 +1015,12 @@ script = ExtResource( 18 )
 [node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"]
 margin_left = 704.0
 margin_right = 704.0
-margin_bottom = 404.0
+margin_bottom = 392.0
 size_flags_vertical = 3
 stretch = true
 
 [node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2"]
-size = Vector2( 0, 404 )
+size = Vector2( 0, 392 )
 handle_input_locally = false
 render_target_update_mode = 3
 script = ExtResource( 19 )
@@ -1276,6 +1276,9 @@ margin_bottom = 70.0
 window_title = "Save before exiting?"
 resizable = true
 dialog_text = "You have unsaved progress. How do you wish to proceed?"
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="ErrorDialog" type="AcceptDialog" parent="."]
 margin_right = 76.0