Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tall wide screen corrections #478

Merged
merged 22 commits into from
May 10, 2021
Merged

Tall wide screen corrections #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0aa41f6
Merge pull request #1 from Orama-Interactive/master
Variable-ind Jan 26, 2021
2c502db
Merge pull request #2 from Orama-Interactive/master
Variable-ind Jan 26, 2021
63c5ea2
Merge pull request #5 from Orama-Interactive/master
Variable-ind Jan 29, 2021
dc4278d
Merge pull request #7 from Orama-Interactive/master
Variable-ind Feb 3, 2021
6b824f6
Merge pull request #8 from Orama-Interactive/master
Variable-ind Feb 4, 2021
5d74449
fixed some more bugs
Variable-ind Feb 5, 2021
925d3c9
Removed some more bugs
Variable-ind Feb 5, 2021
5d0dda6
Added "Replace Frame" option
Variable-ind Feb 5, 2021
81e0583
Update PreviewDialog.tscn
Variable-ind Feb 5, 2021
04d7316
Update PreviewDialog.gd
Variable-ind Feb 5, 2021
563bb43
Update OpenSave.gd
Variable-ind Feb 5, 2021
c03122c
Merge pull request #9 from Orama-Interactive/master
Variable-ind Feb 6, 2021
4cc7c88
Added some new pixel fonts
Variable-ind Feb 7, 2021
f8ac82e
Merge pull request #10 from Orama-Interactive/master
Variable-ind Feb 9, 2021
d1d0a1e
updating (#12)
Variable-ind May 4, 2021
77e559f
Merge pull request #13 from Orama-Interactive/master
Variable-ind May 4, 2021
90cbee1
Merge pull request #14 from Orama-Interactive/master
Variable-ind May 5, 2021
62331c8
Merge pull request #15 from Orama-Interactive/master
Variable-ind May 10, 2021
55c0e3d
a minor visibility change.
Variable-ind May 10, 2021
178b76c
Added some lines of code in "change_ui_layout()"
Variable-ind May 10, 2021
2796b4f
added a line to fix tall-screen "zen-mode"
Variable-ind May 10, 2021
c7f7af7
removed un-needed fonts
Variable-ind May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Main.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ func change_ui_layout(mode : String) -> void:

if mode == "tallscreen" and not tallscreen_is_active:
tallscreen_is_active = true
# changing visibility and re-parenting of nodes for tall screen
ui.get_node("CanvasAndTimeline/HBoxContainer").visible = true
reparent_node_to(Global.animation_timeline, ui.get_node("CanvasAndTimeline/HBoxContainer/BottomPanel"), 0)
reparent_node_to(right_panel, bottom_panel, 0)
right_panel.rect_min_size.y = 300
reparent_node_to(canvas_preview_container, tool_and_palette_vsplit, 1)
Expand All @@ -89,6 +92,9 @@ func change_ui_layout(mode : String) -> void:
reparent_node_to(tool_panel, ui.get_node("CanvasAndTimeline/HBoxContainer"), 0)
elif mode == "widescreen" and tallscreen_is_active:
tallscreen_is_active = false
# Reparenting and hiding nodes to adjust wide-screen
reparent_node_to(Global.animation_timeline, ui.get_node("CanvasAndTimeline"), 1)
ui.get_node("CanvasAndTimeline/HBoxContainer").visible = false
reparent_node_to(right_panel, ui, -1)
right_panel.rect_min_size.y = 0
reparent_node_to(canvas_preview_container, right_panel.get_node("PreviewAndPalettes"), 0)
Expand Down
1 change: 1 addition & 0 deletions src/UI/TopMenuContainer.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ func toggle_zen_mode() -> void:
Global.tool_panel.visible = zen_mode
Global.right_panel.visible = zen_mode
Global.tabs_container.visible = zen_mode
Global.control.get_node("MenuAndUI/UI/CanvasAndTimeline/HBoxContainer").visible = zen_mode
zen_mode = !zen_mode
view_menu.set_item_checked(ViewMenuId.ZEN_MODE, zen_mode)

Expand Down
14 changes: 8 additions & 6 deletions src/UI/UI.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ margin_right = 950.0
margin_bottom = 692.0
size_flags_horizontal = 3
custom_constants/autohide = 0
split_offset = 278

[node name="ViewportAndRulers" type="VBoxContainer" parent="CanvasAndTimeline"]
margin_right = 902.0
Expand Down Expand Up @@ -539,7 +540,14 @@ current = true
zoom = Vector2( 0.15, 0.15 )
script = ExtResource( 7 )

[node name="AnimationTimeline" parent="CanvasAndTimeline" instance=ExtResource( 18 )]
margin_top = 492.0
margin_bottom = 692.0
size_flags_vertical = 3
custom_styles/panel = SubResource( 3 )

[node name="HBoxContainer" type="HBoxContainer" parent="CanvasAndTimeline"]
visible = false
margin_top = 492.0
margin_right = 902.0
margin_bottom = 692.0
Expand All @@ -552,12 +560,6 @@ size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/autohide = 0

[node name="AnimationTimeline" parent="CanvasAndTimeline/HBoxContainer/BottomPanel" instance=ExtResource( 18 )]
margin_top = 0.0
margin_bottom = 200.0
size_flags_vertical = 3
custom_styles/panel = SubResource( 3 )

[node name="RightPanel" type="Panel" parent="."]
margin_left = 950.0
margin_right = 1280.0
Expand Down