huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Add a VSplitContainer between the canvas and the timeline

Browse source
This commit is contained in:
OverloadedOrama 2020-03-09 01:53:20 +02:00
parent 65544dcfc1
commit f4dbd2aadb
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Changelog.md
View file

@ -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! - A confirmation message now appears when the user quits Pixelorama, if there are unsaved changes - thanks to Schweini07!
### Changed ### Changed
- The timeline has been revamped!
- An asterisk is added to the window title if there are unsaved changes. - 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. - Notification text is now black on the gold and light themes.
### Fixed ### Fixed
- Chinese characters not being rendered in notifications (the labels that appear when undoing/redoing) - 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 ## [v0.6.2] - 17-02-2020

25
Main.tscn
View file

@ -919,22 +919,22 @@ hint_tooltip = "VERTMIRROR_HT"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
text = "Vertical" text = "Vertical"
[node name="CanvasAndTimeline" type="VBoxContainer" parent="MenuAndUI/UI"] [node name="CanvasAndTimeline" type="VSplitContainer" parent="MenuAndUI/UI"]
margin_left = 224.0 margin_left = 224.0
margin_right = 928.0 margin_right = 928.0
margin_bottom = 620.0 margin_bottom = 620.0
size_flags_horizontal = 3 size_flags_horizontal = 3
custom_constants/separation = 0 custom_constants/autohide = 0
[node name="HViewportContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline"] [node name="HViewportContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline"]
margin_right = 704.0 margin_right = 704.0
margin_bottom = 420.0 margin_bottom = 408.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="ViewportAndRulers" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] [node name="ViewportAndRulers" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"]
margin_right = 704.0 margin_right = 704.0
margin_bottom = 420.0 margin_bottom = 408.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/separation = 0 custom_constants/separation = 0
@ -955,20 +955,20 @@ script = ExtResource( 14 )
[node name="HSplitContainer" type="HSplitContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] [node name="HSplitContainer" type="HSplitContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"]
margin_top = 16.0 margin_top = 16.0
margin_right = 704.0 margin_right = 704.0
margin_bottom = 420.0 margin_bottom = 408.0
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/autohide = 0 custom_constants/autohide = 0
[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"] [node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"]
margin_right = 692.0 margin_right = 692.0
margin_bottom = 404.0 margin_bottom = 392.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/separation = 0 custom_constants/separation = 0
[node name="VerticalRuler" type="Button" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] [node name="VerticalRuler" type="Button" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"]
margin_right = 16.0 margin_right = 16.0
margin_bottom = 404.0 margin_bottom = 392.0
rect_min_size = Vector2( 16, 0 ) rect_min_size = Vector2( 16, 0 )
focus_mode = 0 focus_mode = 0
mouse_default_cursor_shape = 15 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"] [node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"]
margin_left = 16.0 margin_left = 16.0
margin_right = 692.0 margin_right = 692.0
margin_bottom = 404.0 margin_bottom = 392.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
stretch = true stretch = true
[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] [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 handle_input_locally = false
usage = 0 usage = 0
render_target_update_mode = 3 render_target_update_mode = 3
@ -1015,12 +1015,12 @@ script = ExtResource( 18 )
[node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"] [node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"]
margin_left = 704.0 margin_left = 704.0
margin_right = 704.0 margin_right = 704.0
margin_bottom = 404.0 margin_bottom = 392.0
size_flags_vertical = 3 size_flags_vertical = 3
stretch = true stretch = true
[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2"] [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 handle_input_locally = false
render_target_update_mode = 3 render_target_update_mode = 3
script = ExtResource( 19 ) script = ExtResource( 19 )
@ -1276,6 +1276,9 @@ margin_bottom = 70.0
window_title = "Save before exiting?" window_title = "Save before exiting?"
resizable = true resizable = true
dialog_text = "You have unsaved progress. How do you wish to proceed?" dialog_text = "You have unsaved progress. How do you wish to proceed?"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ErrorDialog" type="AcceptDialog" parent="."] [node name="ErrorDialog" type="AcceptDialog" parent="."]
margin_right = 76.0 margin_right = 76.0