Skip to content

Ready for alpha 2 release (seriously this time) #26

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

Merged
syntaxerror247 merged 1 commit into from
May 18, 2025
Merged

Ready for alpha 2 release (seriously this time) #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Ready for alpha 2 release (seriously this time) 
- Add granularity in auto scaling.
- Make 1.5 as base scaling.
- Add "duplicate" and "Save" as default in shortcut panel.
  • Loading branch information
@syntaxerror247
syntaxerror247 committed May 18, 2025
commit ce29eddb44c1f2be08a7ba0c7291fcc67139e0d3
2 changes: 1 addition & 1 deletion src/autoload/Configs.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func reset_settings() -> void:
savedata = SaveData.new()
savedata.reset_to_default()
savedata.language = "en"
savedata.set_shortcut_panel_slots({ 0: "ui_undo", 1: "ui_redo" })
savedata.set_shortcut_panel_slots({ 0: "ui_undo", 1: "ui_redo", 2: "duplicate", 3: "save" })
savedata.set_palettes([Palette.new("Pure", Palette.Preset.PURE)])
save()

Expand Down
25 changes: 18 additions & 7 deletions src/autoload/HandlerGUI.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,23 +366,34 @@ func get_min_ui_scale() -> float:

func get_auto_ui_scale() -> float:
var dpi := DisplayServer.screen_get_dpi(DisplayServer.window_get_current_screen())

if dpi <= 120:
return 0.75 # ldpi
return 0.75
elif dpi <= 160:
return 1.0 # mdpi
return 1.0
elif dpi <= 200:
return 1.25
elif dpi <= 240:
return 1.5 # hdpi
return 1.5
elif dpi <= 280:
return 1.75
elif dpi <= 320:
return 2.0 # xhdpi
return 2.0
elif dpi <= 360:
return 2.25
elif dpi <= 400:
return 2.5
elif dpi <= 440:
return 2.75
elif dpi <= 480:
return 3.0 # xxhdpi
return 3.0
elif dpi <= 560:
return 3.5
elif dpi <= 640:
return 4.0 # xxxhdpi
return 4.0
else:
return 5.0


func update_ui_scale() -> void:
var window := get_window()
Expand Down
16 changes: 10 additions & 6 deletions src/ui_parts/settings_menu.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ func setup_content() -> void:
current_setup_setting = "ui_scale"
var dropdown_values := [
SaveData.ScalingApproach.AUTO,
SaveData.ScalingApproach.CONSTANT_100,
SaveData.ScalingApproach.CONSTANT_125,
SaveData.ScalingApproach.CONSTANT_150,
SaveData.ScalingApproach.CONSTANT_175,
SaveData.ScalingApproach.CONSTANT_200,
Expand All @@ -257,12 +259,14 @@ func setup_content() -> void:
]
# Dictionary[SaveData.ScalingApproach, String]
var dropdown_map: Dictionary = {
SaveData.ScalingApproach.AUTO: "Auto (%d%%)" % int(HandlerGUI.get_auto_ui_scale() / 2.0 * 100),
SaveData.ScalingApproach.CONSTANT_150: "75%",
SaveData.ScalingApproach.CONSTANT_175: "88%",
SaveData.ScalingApproach.CONSTANT_200: "100%",
SaveData.ScalingApproach.CONSTANT_250: "125%",
SaveData.ScalingApproach.CONSTANT_300: "150%"
SaveData.ScalingApproach.AUTO: "Auto (%d%%)" % int(HandlerGUI.get_auto_ui_scale()/ 1.5 * 100),
SaveData.ScalingApproach.CONSTANT_100: "66%",
SaveData.ScalingApproach.CONSTANT_125: "83%",
SaveData.ScalingApproach.CONSTANT_150: "100%",
SaveData.ScalingApproach.CONSTANT_175: "116%",
SaveData.ScalingApproach.CONSTANT_200: "133%",
SaveData.ScalingApproach.CONSTANT_250: "166%",
SaveData.ScalingApproach.CONSTANT_300: "200%"
}
add_dropdown(Translator.translate("UI scale"), dropdown_values, dropdown_map)
add_advice(Translator.translate("Changes the scale factor for the interface."))
Expand Down