Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,17 @@ config_version=5

[application]

config/name="GodSVG"
config/name="GodSVG Mobile"
config/version="1.0-alpha7"
config/tags=PackedStringArray("project")
run/main_scene="res://src/ui_parts/editor_scene.tscn"
run/main_scene="uid://bihwwoedqcyo8"
config/use_custom_user_dir=true
config/features=PackedStringArray("4.4")
run/low_processor_mode=true
boot_splash/bg_color=Color(0.1065, 0.1181, 0.15, 1)
boot_splash/image="res://assets/logos/splash.png"
boot_splash/fullsize=false
config/icon="res://assets/logos/icon.png"
config/macos_native_icon="res://visual/icon.icns"
config/windows_native_icon="res://visual/icon.ico"

[audio]

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

[display]

window/size/viewport_width=1040
window/size/viewport_height=650
window/size/mode=2
window/size/viewport_width=720
window/size/viewport_height=1280
window/energy_saving/keep_screen_on=false
window/handheld/orientation=1
mouse_cursor/tooltip_position_offset=Vector2(0, 10)

[filesystem]
Expand Down
2 changes: 0 additions & 2 deletions src/autoload/HandlerGUI.gd
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,6 @@ func _calculate_auto_scale() -> float:
else:
return 5.0 # Beyond xxxhdpi

return 1.0 # Default fallback scale


func update_window_title() -> void:
if Configs.savedata.use_filename_for_window_title and\
Expand Down
17 changes: 0 additions & 17 deletions src/portrait_ui/editor_scene.gd

This file was deleted.

1 change: 0 additions & 1 deletion src/portrait_ui/editor_scene.gd.uid

This file was deleted.

54 changes: 0 additions & 54 deletions src/portrait_ui/editor_scene.tscn

This file was deleted.

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

[sub_resource type="ShaderMaterial" id="ShaderMaterial_kqplg"]
shader = ExtResource("10_x7ybk")
shader_parameter/uv_scale = 1.0

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eujxa"]
bg_color = Color(0.866667, 0.933333, 1, 0.133333)
corner_radius_top_left = 5
corner_radius_bottom_left = 5

[sub_resource type="ShaderMaterial" id="ShaderMaterial_kqplg"]
shader = ExtResource("10_x7ybk")
shader_parameter/uv_scale = 1.0

[node name="Display" type="VBoxContainer"]
anchors_preset = 15
anchor_right = 1.0
Expand All @@ -48,6 +48,59 @@ size_flags_vertical = 3
layout_mode = 2
theme_override_constants/separation = 0

[node name="ViewportContainer" type="SubViewportContainer" parent="ViewportPanel/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
stretch = true

[node name="Viewport" type="SubViewport" parent="ViewportPanel/VBoxContainer/ViewportContainer"]
unique_name_in_owner = true
disable_3d = true
handle_input_locally = false
gui_snap_controls_to_pixels = false
size = Vector2i(720, 1225)
size_2d_override_stretch = true
render_target_update_mode = 4
script = ExtResource("9_4xrk7")

[node name="ReferenceTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
visible = false
offset_right = 128.0
offset_bottom = 128.0
expand_mode = 1
stretch_mode = 5

[node name="Checkerboard" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
texture_filter = 1
material = SubResource("ShaderMaterial_kqplg")
clip_contents = true
texture = ExtResource("11_1bm1s")
expand_mode = 1
stretch_mode = 1

[node name="DisplayTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport/Checkerboard"]
clip_contents = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
expand_mode = 1
script = ExtResource("12_qi23s")

[node name="Controls" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
layout_mode = 3
anchors_preset = 0
mouse_filter = 1
script = ExtResource("13_lwhwy")

[node name="Camera" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
layout_mode = 3
anchors_preset = 0
mouse_filter = 2
script = ExtResource("15_hevpa")

[node name="Toolbar" type="PanelContainer" parent="ViewportPanel/VBoxContainer"]
layout_mode = 2

Expand Down Expand Up @@ -106,60 +159,6 @@ allow_lower = false
unique_name_in_owner = true
layout_mode = 2

[node name="ViewportContainer" type="SubViewportContainer" parent="ViewportPanel/VBoxContainer"]
custom_minimum_size = Vector2(450, 0)
layout_mode = 2
size_flags_vertical = 3
stretch = true

[node name="Viewport" type="SubViewport" parent="ViewportPanel/VBoxContainer/ViewportContainer"]
unique_name_in_owner = true
disable_3d = true
handle_input_locally = false
gui_snap_controls_to_pixels = false
size = Vector2i(450, 2)
size_2d_override_stretch = true
render_target_update_mode = 4
script = ExtResource("9_4xrk7")

[node name="ReferenceTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
visible = false
offset_right = 128.0
offset_bottom = 128.0
expand_mode = 1
stretch_mode = 5

[node name="Checkerboard" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
texture_filter = 1
material = SubResource("ShaderMaterial_kqplg")
clip_contents = true
texture = ExtResource("11_1bm1s")
expand_mode = 1
stretch_mode = 1

[node name="DisplayTexture" type="TextureRect" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport/Checkerboard"]
clip_contents = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
expand_mode = 1
script = ExtResource("12_qi23s")

[node name="Controls" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
layout_mode = 3
anchors_preset = 0
mouse_filter = 1
script = ExtResource("13_lwhwy")

[node name="Camera" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
layout_mode = 3
anchors_preset = 0
mouse_filter = 2
script = ExtResource("15_hevpa")

[node name="DebugMargins" type="MarginContainer" parent="ViewportPanel"]
visible = false
layout_mode = 2
Expand Down Expand Up @@ -193,10 +192,10 @@ theme_override_constants/outline_size = 4
theme_override_font_sizes/font_size = 14
horizontal_alignment = 2

[connection signal="size_changed" from="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="_on_size_changed"]
[connection signal="pressed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Visuals" to="." method="_on_visuals_button_pressed"]
[connection signal="pressed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Reference" to="." method="_on_reference_pressed"]
[connection signal="toggled" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Snapping/SnapButton" to="." method="_on_snap_button_toggled"]
[connection signal="value_changed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/LeftMenu/Snapping/SnapNumberEdit" to="." method="_on_snap_number_edit_value_changed"]
[connection signal="zoom_changed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/ZoomMenu" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="_on_zoom_changed"]
[connection signal="zoom_reset_pressed" from="ViewportPanel/VBoxContainer/Toolbar/ViewportOptions/ZoomMenu" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="center_frame"]
[connection signal="size_changed" from="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" to="ViewportPanel/VBoxContainer/ViewportContainer/Viewport" method="_on_size_changed"]
18 changes: 1 addition & 17 deletions src/ui_parts/editor_scene.gd
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
extends HBoxContainer

const MacMenu = preload("res://src/ui_parts/mac_menu.tscn")

@onready var panel_container: PanelContainer = $PanelContainer

func _ready() -> void:
Configs.theme_changed.connect(update_theme)
update_theme()
if NativeMenu.has_feature(NativeMenu.FEATURE_GLOBAL_MENU):
add_child(MacMenu.instantiate())

func update_theme() -> void:
var stylebox := StyleBoxFlat.new()
stylebox.bg_color = ThemeUtils.overlay_panel_inner_color
stylebox.set_content_margin_all(0)
panel_container.add_theme_stylebox_override("panel", stylebox)
extends VBoxContainer
2 changes: 1 addition & 1 deletion src/ui_parts/editor_scene.gd.uid
Original file line number Diff line number Diff line change
@@ -1 +1 @@
uid://b14gd6s3wl4us
uid://dunoppeuubgd1
Loading