Skip to content

Commit b9e3d4c

Browse files
Ready for alpha 2 release (seriously this time) (#26)
- Add granularity in auto scaling. - Make 1.5 as base scaling. - Add "duplicate" and "Save" as default in shortcut panel.
1 parent 76a1de9 commit b9e3d4c

File tree

3 files changed

+29
-14
lines changed

3 files changed

+29
-14
lines changed

src/autoload/Configs.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func reset_settings() -> void:
7575
savedata = SaveData.new()
7676
savedata.reset_to_default()
7777
savedata.language = "en"
78-
savedata.set_shortcut_panel_slots({ 0: "ui_undo", 1: "ui_redo" })
78+
savedata.set_shortcut_panel_slots({ 0: "ui_undo", 1: "ui_redo", 2: "duplicate", 3: "save" })
7979
savedata.set_palettes([Palette.new("Pure", Palette.Preset.PURE)])
8080
save()
8181

src/autoload/HandlerGUI.gd

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,23 +366,34 @@ func get_min_ui_scale() -> float:
366366

367367
func get_auto_ui_scale() -> float:
368368
var dpi := DisplayServer.screen_get_dpi(DisplayServer.window_get_current_screen())
369+
369370
if dpi <= 120:
370-
return 0.75 # ldpi
371+
return 0.75
371372
elif dpi <= 160:
372-
return 1.0 # mdpi
373+
return 1.0
374+
elif dpi <= 200:
375+
return 1.25
373376
elif dpi <= 240:
374-
return 1.5 # hdpi
377+
return 1.5
378+
elif dpi <= 280:
379+
return 1.75
375380
elif dpi <= 320:
376-
return 2.0 # xhdpi
381+
return 2.0
382+
elif dpi <= 360:
383+
return 2.25
377384
elif dpi <= 400:
378385
return 2.5
386+
elif dpi <= 440:
387+
return 2.75
379388
elif dpi <= 480:
380-
return 3.0 # xxhdpi
389+
return 3.0
390+
elif dpi <= 560:
391+
return 3.5
381392
elif dpi <= 640:
382-
return 4.0 # xxxhdpi
393+
return 4.0
383394
else:
384395
return 5.0
385-
396+
386397

387398
func update_ui_scale() -> void:
388399
var window := get_window()

src/ui_parts/settings_menu.gd

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ func setup_content() -> void:
249249
current_setup_setting = "ui_scale"
250250
var dropdown_values := [
251251
SaveData.ScalingApproach.AUTO,
252+
SaveData.ScalingApproach.CONSTANT_100,
253+
SaveData.ScalingApproach.CONSTANT_125,
252254
SaveData.ScalingApproach.CONSTANT_150,
253255
SaveData.ScalingApproach.CONSTANT_175,
254256
SaveData.ScalingApproach.CONSTANT_200,
@@ -257,12 +259,14 @@ func setup_content() -> void:
257259
]
258260
# Dictionary[SaveData.ScalingApproach, String]
259261
var dropdown_map: Dictionary = {
260-
SaveData.ScalingApproach.AUTO: "Auto (%d%%)" % int(HandlerGUI.get_auto_ui_scale() / 2.0 * 100),
261-
SaveData.ScalingApproach.CONSTANT_150: "75%",
262-
SaveData.ScalingApproach.CONSTANT_175: "88%",
263-
SaveData.ScalingApproach.CONSTANT_200: "100%",
264-
SaveData.ScalingApproach.CONSTANT_250: "125%",
265-
SaveData.ScalingApproach.CONSTANT_300: "150%"
262+
SaveData.ScalingApproach.AUTO: "Auto (%d%%)" % int(HandlerGUI.get_auto_ui_scale()/ 1.5 * 100),
263+
SaveData.ScalingApproach.CONSTANT_100: "66%",
264+
SaveData.ScalingApproach.CONSTANT_125: "83%",
265+
SaveData.ScalingApproach.CONSTANT_150: "100%",
266+
SaveData.ScalingApproach.CONSTANT_175: "116%",
267+
SaveData.ScalingApproach.CONSTANT_200: "133%",
268+
SaveData.ScalingApproach.CONSTANT_250: "166%",
269+
SaveData.ScalingApproach.CONSTANT_300: "200%"
266270
}
267271
add_dropdown(Translator.translate("UI scale"), dropdown_values, dropdown_map)
268272
add_advice(Translator.translate("Changes the scale factor for the interface."))

0 commit comments

Comments
 (0)