From 28ca2cd87e7656fcc6a5e846bef51d7bd6abb0cf Mon Sep 17 00:00:00 2001 From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 10 Nov 2020 01:32:27 +0200 Subject: [PATCH] Small improvements and bug fixes to the Display Scale option When clicking Apply, the zoom level now gets fit to the frame, and the Preferences dialog keeps its focus and its tabs. --- src/Preferences/PreferencesDialog.gd | 14 ++++++++------ src/Preferences/PreferencesDialog.tscn | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Preferences/PreferencesDialog.gd b/src/Preferences/PreferencesDialog.gd index 5494f1d..0df93fe 100644 --- a/src/Preferences/PreferencesDialog.gd +++ b/src/Preferences/PreferencesDialog.gd @@ -176,13 +176,15 @@ func _on_List_item_selected(index : int) -> void: child.visible = child.name == content_list[index] -func _on_HSlider_value_changed(value): +func _on_ShrinkHSlider_value_changed(value : float) -> void: shrink_label.text = str(value) -func _on_ShrinkApplyButton_pressed(): +func _on_ShrinkApplyButton_pressed() -> void: get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_DISABLED, - SceneTree.STRETCH_ASPECT_IGNORE, Vector2(1014,576), Global.shrink) - Global.preferences_dialog.popup_centered(Vector2(400, 280)) - Global.camera.zoom_100() - + SceneTree.STRETCH_ASPECT_IGNORE, Vector2(1024,576), Global.shrink) + hide() + popup_centered(Vector2(400, 280)) + Global.dialog_open(true) + yield(Global.get_tree().create_timer(0.01), "timeout") + Global.camera.fit_to_frame(Global.current_project.size) diff --git a/src/Preferences/PreferencesDialog.tscn b/src/Preferences/PreferencesDialog.tscn index 6055784..0d22e64 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -995,7 +995,7 @@ __meta__ = { [connection signal="about_to_show" from="." to="." method="_on_PreferencesDialog_about_to_show"] [connection signal="popup_hide" from="." to="." method="_on_PreferencesDialog_popup_hide"] [connection signal="item_selected" from="HSplitContainer/List" to="." method="_on_List_item_selected"] -[connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer/ShrinkHSlider" to="." method="_on_HSlider_value_changed"] +[connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer/ShrinkHSlider" to="." method="_on_ShrinkHSlider_value_changed"] [connection signal="pressed" from="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer/ShrinkApplyButton" to="." method="_on_ShrinkApplyButton_pressed"] [connection signal="item_selected" from="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer/PresetOptionButton" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_PresetOptionButton_item_selected"] [connection signal="confirmed" from="Popups/ShortcutSelector" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_ShortcutSelector_confirmed"]