Skip to content

Commit ff06151

Browse files
Fix UI and some other misc changes (#13)
1 parent 9780fd3 commit ff06151

File tree

11 files changed

+101
-206
lines changed

11 files changed

+101
-206
lines changed

project.godot

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,17 @@ config_version=5
1010

1111
[application]
1212

13-
config/name="GodSVG"
13+
config/name="GodSVG Mobile"
1414
config/version="1.0-alpha7"
1515
config/tags=PackedStringArray("project")
16-
run/main_scene="res://src/ui_parts/editor_scene.tscn"
16+
run/main_scene="uid://bihwwoedqcyo8"
1717
config/use_custom_user_dir=true
1818
config/features=PackedStringArray("4.4")
1919
run/low_processor_mode=true
2020
boot_splash/bg_color=Color(0.1065, 0.1181, 0.15, 1)
2121
boot_splash/image="res://assets/logos/splash.png"
2222
boot_splash/fullsize=false
2323
config/icon="res://assets/logos/icon.png"
24-
config/macos_native_icon="res://visual/icon.icns"
25-
config/windows_native_icon="res://visual/icon.ico"
2624

2725
[audio]
2826

@@ -36,10 +34,10 @@ HandlerGUI="*res://src/autoload/HandlerGUI.gd"
3634

3735
[display]
3836

39-
window/size/viewport_width=1040
40-
window/size/viewport_height=650
41-
window/size/mode=2
37+
window/size/viewport_width=720
38+
window/size/viewport_height=1280
4239
window/energy_saving/keep_screen_on=false
40+
window/handheld/orientation=1
4341
mouse_cursor/tooltip_position_offset=Vector2(0, 10)
4442

4543
[filesystem]

src/autoload/HandlerGUI.gd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,6 @@ func _calculate_auto_scale() -> float:
323323
else:
324324
return 5.0 # Beyond xxxhdpi
325325

326-
return 1.0 # Default fallback scale
327-
328326

329327
func update_window_title() -> void:
330328
if Configs.savedata.use_filename_for_window_title and\

src/portrait_ui/editor_scene.gd

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/portrait_ui/editor_scene.gd.uid

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/portrait_ui/editor_scene.tscn

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/ui_parts/display.tscn

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
[ext_resource type="Texture2D" uid="uid://iglrqrqyg4kn" path="res://assets/icons/Reference.svg" id="4_2hiq7"]
55
[ext_resource type="Texture2D" uid="uid://kkxyv1gyrjgj" path="res://assets/icons/Visuals.svg" id="4_n3qjt"]
66
[ext_resource type="Texture2D" uid="uid://buire51l0mifg" path="res://assets/icons/Snap.svg" id="5_1k2cq"]
7-
[ext_resource type="Script" uid="uid://ynx3s1jc6bwq" path="res://src/ui_widgets/BetterToggleButton.gd" id="6_3v3ve"]
7+
[ext_resource type="Script" uid="uid://cgv206odqfy2k" path="res://src/ui_widgets/BetterToggleButton.gd" id="6_3v3ve"]
88
[ext_resource type="PackedScene" uid="uid://dad7fkhmsooc6" path="res://src/ui_widgets/number_edit.tscn" id="7_wrrfr"]
99
[ext_resource type="PackedScene" uid="uid://oltvrf01xrxl" path="res://src/ui_parts/zoom_menu.tscn" id="8_xtdmn"]
1010
[ext_resource type="Script" uid="uid://b6pmlbnl76wmm" path="res://src/ui_parts/viewport.gd" id="9_4xrk7"]
1111
[ext_resource type="Script" uid="uid://rqrxhe8wa6fn" path="res://src/ui_parts/tab_bar.gd" id="9_rll1m"]
12-
[ext_resource type="Shader" uid="uid://i2y5pyhcgra2" path="res://src/shaders/zoom_shader.gdshader" id="10_x7ybk"]
12+
[ext_resource type="Shader" uid="uid://ki2mjb6y33jl" path="res://src/shaders/zoom_shader.gdshader" id="10_x7ybk"]
1313
[ext_resource type="Texture2D" uid="uid://c68og6bsqt0lb" path="res://assets/icons/backgrounds/Checkerboard.svg" id="11_1bm1s"]
1414
[ext_resource type="Script" uid="uid://dtplje5mhdmrj" path="res://src/ui_parts/display_texture.gd" id="12_qi23s"]
1515
[ext_resource type="Script" uid="uid://csqewpxr21ywy" path="res://src/ui_parts/handles_manager.gd" id="13_lwhwy"]
1616
[ext_resource type="Script" uid="uid://cm5033meho5vr" path="res://src/ui_widgets/camera.gd" id="15_hevpa"]
1717

18+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_kqplg"]
19+
shader = ExtResource("10_x7ybk")
20+
shader_parameter/uv_scale = 1.0
21+
1822
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eujxa"]
1923
bg_color = Color(0.866667, 0.933333, 1, 0.133333)
2024
corner_radius_top_left = 5
2125
corner_radius_bottom_left = 5
2226

23-
[sub_resource type="ShaderMaterial" id="ShaderMaterial_kqplg"]
24-
shader = ExtResource("10_x7ybk")
25-
shader_parameter/uv_scale = 1.0
26-
2727
[node name="Display" type="VBoxContainer"]
2828
anchors_preset = 15
2929
anchor_right = 1.0
@@ -48,6 +48,59 @@ size_flags_vertical = 3
4848
layout_mode = 2
4949
theme_override_constants/separation = 0
5050

51+
[node name="ViewportContainer" type="SubViewportContainer" parent="ViewportPanel/VBoxContainer"]
52+
layout_mode = 2
53+
size_flags_vertical = 3
54+
stretch = true
55+
56+
[node name="Viewport" type="SubViewport" parent="ViewportPanel/VBoxContainer/ViewportContainer"]
57+
unique_name_in_owner = true
58+
disable_3d = true
59+
handle_input_locally = false
60+
gui_snap_controls_to_pixels = false
61+
size = Vector2i(720, 1225)
62+
size_2d_override_stretch = true
63+
render_target_update_mode = 4
64+
script = ExtResource("9_4xrk7")
65+
66+
[node name="ReferenceTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
67+
visible = false
68+
offset_right = 128.0
69+
offset_bottom = 128.0
70+
expand_mode = 1
71+
stretch_mode = 5
72+
73+
[node name="Checkerboard" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
74+
texture_filter = 1
75+
material = SubResource("ShaderMaterial_kqplg")
76+
clip_contents = true
77+
texture = ExtResource("11_1bm1s")
78+
expand_mode = 1
79+
stretch_mode = 1
80+
81+
[node name="DisplayTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport/Checkerboard"]
82+
clip_contents = true
83+
layout_mode = 1
84+
anchors_preset = 15
85+
anchor_right = 1.0
86+
anchor_bottom = 1.0
87+
grow_horizontal = 2
88+
grow_vertical = 2
89+
expand_mode = 1
90+
script = ExtResource("12_qi23s")
91+
92+
[node name="Controls" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
93+
layout_mode = 3
94+
anchors_preset = 0
95+
mouse_filter = 1
96+
script = ExtResource("13_lwhwy")
97+
98+
[node name="Camera" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
99+
layout_mode = 3
100+
anchors_preset = 0
101+
mouse_filter = 2
102+
script = ExtResource("15_hevpa")
103+
51104
[node name="Toolbar" type="PanelContainer" parent="ViewportPanel/VBoxContainer"]
52105
layout_mode = 2
53106

@@ -106,60 +159,6 @@ allow_lower = false
106159
unique_name_in_owner = true
107160
layout_mode = 2
108161

109-
[node name="ViewportContainer" type="SubViewportContainer" parent="ViewportPanel/VBoxContainer"]
110-
custom_minimum_size = Vector2(450, 0)
111-
layout_mode = 2
112-
size_flags_vertical = 3
113-
stretch = true
114-
115-
[node name="Viewport" type="SubViewport" parent="ViewportPanel/VBoxContainer/ViewportContainer"]
116-
unique_name_in_owner = true
117-
disable_3d = true
118-
handle_input_locally = false
119-
gui_snap_controls_to_pixels = false
120-
size = Vector2i(450, 2)
121-
size_2d_override_stretch = true
122-
render_target_update_mode = 4
123-
script = ExtResource("9_4xrk7")
124-
125-
[node name="ReferenceTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
126-
visible = false
127-
offset_right = 128.0
128-
offset_bottom = 128.0
129-
expand_mode = 1
130-
stretch_mode = 5
131-
132-
[node name="Checkerboard" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
133-
texture_filter = 1
134-
material = SubResource("ShaderMaterial_kqplg")
135-
clip_contents = true
136-
texture = ExtResource("11_1bm1s")
137-
expand_mode = 1
138-
stretch_mode = 1
139-
140-
[node name="DisplayTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport/Checkerboard"]
141-
clip_contents = true
142-
layout_mode = 1
143-
anchors_preset = 15
144-
anchor_right = 1.0
145-
anchor_bottom = 1.0
146-
grow_horizontal = 2
147-
grow_vertical = 2
148-
expand_mode = 1
149-
script = ExtResource("12_qi23s")
150-
151-
[node name="Controls" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
152-
layout_mode = 3
153-
anchors_preset = 0
154-
mouse_filter = 1
155-
script = ExtResource("13_lwhwy")
156-
157-
[node name="Camera" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
158-
layout_mode = 3
159-
anchors_preset = 0
160-
mouse_filter = 2
161-
script = ExtResource("15_hevpa")
162-
163162
[node name="DebugMargins" type="MarginContainer" parent="ViewportPanel"]
164163
visible = false
165164
layout_mode = 2
@@ -193,10 +192,10 @@ theme_override_constants/outline_size = 4
193192
theme_override_font_sizes/font_size = 14
194193
horizontal_alignment = 2
195194

195+
[connection signal="size_changed" from="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="_on_size_changed"]
196196
[connection signal="pressed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Visuals" to="." method="_on_visuals_button_pressed"]
197197
[connection signal="pressed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Reference" to="." method="_on_reference_pressed"]
198198
[connection signal="toggled" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Snapping/SnapButton" to="." method="_on_snap_button_toggled"]
199199
[connection signal="value_changed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Snapping/SnapNumberEdit" to="." method="_on_snap_number_edit_value_changed"]
200200
[connection signal="zoom_changed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/ZoomMenu" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="_on_zoom_changed"]
201201
[connection signal="zoom_reset_pressed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/ZoomMenu" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="center_frame"]
202-
[connection signal="size_changed" from="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="_on_size_changed"]

src/ui_parts/editor_scene.gd

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
extends HBoxContainer
2-
3-
const MacMenu = preload("res://src/ui_parts/mac_menu.tscn")
4-
5-
@onready var panel_container: PanelContainer = $PanelContainer
6-
7-
func _ready() -> void:
8-
Configs.theme_changed.connect(update_theme)
9-
update_theme()
10-
if NativeMenu.has_feature(NativeMenu.FEATURE_GLOBAL_MENU):
11-
add_child(MacMenu.instantiate())
12-
13-
func update_theme() -> void:
14-
var stylebox := StyleBoxFlat.new()
15-
stylebox.bg_color = ThemeUtils.overlay_panel_inner_color
16-
stylebox.set_content_margin_all(0)
17-
panel_container.add_theme_stylebox_override("panel", stylebox)
1+
extends VBoxContainer

src/ui_parts/editor_scene.gd.uid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://b14gd6s3wl4us
1+
uid://dunoppeuubgd1

0 commit comments

Comments
 (0)