Skip to content

Commit

Permalink
fixed a lot of window bugs introduced with the
Browse files Browse the repository at this point in the history
last commit, resized all tool
  • Loading branch information
BlankManifold committed Nov 2, 2022
1 parent 12b6c27 commit 258dc4a
Show file tree
Hide file tree
Showing 8 changed files with 269 additions and 216 deletions.
2 changes: 1 addition & 1 deletion assets/temp.tres
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
font_path = "res://assets/Louis George Cafe Bold.ttf"

[resource]
size = 35
size = 20
font_data = SubResource( 1 )
1 change: 1 addition & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ config/icon="res://rect13311B.png"

window/size/width=1920
window/size/height=1080
window/size/fullscreen=true

[global]

Expand Down
47 changes: 29 additions & 18 deletions scenes/MainControl.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,34 @@
[ext_resource path="res://scripts/MainControl.cs" type="Script" id=4]

[node name="MainControl" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -960.0
margin_top = -540.0
margin_right = 960.0
margin_bottom = 540.0
script = ExtResource( 4 )

[node name="CanvasLayer2" type="CanvasLayer" parent="."]
follow_viewport_enable = true
[node name="CanvasLayer" type="CanvasLayer" parent="."]

[node name="ToolsUI" parent="CanvasLayer" instance=ExtResource( 1 )]
unique_name_in_owner = true

[node name="PreviewViewportContainer" type="ViewportContainer" parent="CanvasLayer2"]
[node name="PreviewViewportContainer" type="ViewportContainer" parent="."]
unique_name_in_owner = true
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -1034.0
margin_left = -1080.0
margin_top = -1080.0
margin_right = 1126.0
margin_right = 1080.0
margin_bottom = 1080.0
rect_min_size = Vector2( 1080, 1080 )
rect_min_size = Vector2( 400, 400 )

[node name="PreviewViewport" type="Viewport" parent="CanvasLayer2/PreviewViewportContainer"]
[node name="PreviewViewport" type="Viewport" parent="PreviewViewportContainer"]
unique_name_in_owner = true
size = Vector2( 2160, 2160 )
transparent_bg = true
Expand All @@ -36,15 +44,18 @@ usage = 0
render_target_update_mode = 3
gui_disable_input = true

[node name="PreviewUI" parent="CanvasLayer2/PreviewViewportContainer/PreviewViewport" instance=ExtResource( 2 )]
[node name="PreviewUI" parent="PreviewViewportContainer/PreviewViewport" instance=ExtResource( 2 )]
unique_name_in_owner = true
rect_pivot_offset = Vector2( 1080, 1080 )

[node name="Camera2D" type="Camera2D" parent="CanvasLayer2/PreviewViewportContainer/PreviewViewport/PreviewUI"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 0.0
margin_top = 0.0
margin_right = 2160.0
margin_bottom = 2160.0

[node name="Camera2D" type="Camera2D" parent="."]
unique_name_in_owner = true
position = Vector2( 960, 540 )
current = true

[node name="CanvasLayer" type="CanvasLayer" parent="."]

[node name="ToolsUI" parent="CanvasLayer" instance=ExtResource( 1 )]
unique_name_in_owner = true
6 changes: 5 additions & 1 deletion scenes/PreviewUI.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -540.0
margin_top = -540.0
margin_right = 540.0
margin_bottom = 540.0
mouse_filter = 2
script = ExtResource( 2 )

Expand All @@ -46,7 +50,7 @@ margin_left = -540.0
margin_top = -540.0
margin_right = 540.0
margin_bottom = 540.0
rect_pivot_offset = Vector2( 540, 540 )
rect_pivot_offset = Vector2( 1080, 1080 )

[node name="Text" type="RichTextLabel" parent="BackgroundRect"]
unique_name_in_owner = true
Expand Down
16 changes: 9 additions & 7 deletions scenes/TextEditor.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ font_data = SubResource( 1 )

[node name="TextEditor" type="VBoxContainer"]
margin_top = 98.0
margin_right = 400.0
margin_right = 350.0
margin_bottom = 328.0
rect_min_size = Vector2( 400, 0 )
rect_min_size = Vector2( 350, 0 )
size_flags_horizontal = 0
size_flags_vertical = 0
custom_constants/separation = 10
script = ExtResource( 1 )

[node name="TextEdit" type="TextEdit" parent="."]
margin_right = 400.0
margin_right = 350.0
margin_bottom = 200.0
rect_min_size = Vector2( 300, 200 )
custom_fonts/font = SubResource( 2 )
Expand All @@ -30,20 +32,20 @@ wrap_enabled = true

[node name="Buttons" type="HBoxContainer" parent="."]
margin_top = 210.0
margin_right = 400.0
margin_right = 350.0
margin_bottom = 230.0
custom_constants/separation = 20

[node name="LoadFiles" type="Button" parent="Buttons"]
margin_right = 190.0
margin_right = 165.0
margin_bottom = 20.0
rect_min_size = Vector2( 100, 0 )
size_flags_horizontal = 3
text = "Load texts"

[node name="Update" type="Button" parent="Buttons"]
margin_left = 210.0
margin_right = 400.0
margin_left = 185.0
margin_right = 350.0
margin_bottom = 20.0
rect_min_size = Vector2( 150, 0 )
size_flags_horizontal = 3
Expand Down
Loading

0 comments on commit 258dc4a

Please sign in to comment.