From bd10680f636546800fdcbe3fc19bdedf1f48be8a Mon Sep 17 00:00:00 2001 From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com> Date: Sat, 7 Nov 2020 19:12:31 +0200 Subject: [PATCH] Minor changes to the shrink option --- src/Main.gd | 4 ++-- src/Preferences/PreferencesDialog.gd | 2 +- src/Preferences/PreferencesDialog.tscn | 1 - src/UI/Canvas/Canvas.gd | 5 +++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Main.gd b/src/Main.gd index 5a6312b81..8e474e33a 100644 --- a/src/Main.gd +++ b/src/Main.gd @@ -66,9 +66,9 @@ func setup_application_window_size() -> void: return # Set a minimum window size to prevent UI elements from collapsing on each other. OS.min_window_size = Vector2(1024, 576) - + get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_DISABLED, - SceneTree.STRETCH_ASPECT_IGNORE, Vector2(1014,576), Global.shrink) + SceneTree.STRETCH_ASPECT_IGNORE, Vector2(1024,576), Global.shrink) # Restore the window position/size if values are present in the configuration cache if Global.config_cache.has_section_key("window", "screen"): diff --git a/src/Preferences/PreferencesDialog.gd b/src/Preferences/PreferencesDialog.gd index 5a7eb3f8f..f03e4047a 100644 --- a/src/Preferences/PreferencesDialog.gd +++ b/src/Preferences/PreferencesDialog.gd @@ -185,4 +185,4 @@ func _on_ShrinkApplyButton_pressed(): SceneTree.STRETCH_ASPECT_IGNORE, Vector2(1014,576), Global.shrink) Global.preferences_dialog.popup_centered(Vector2(400, 280)) Global.camera.zoom_100() - + diff --git a/src/Preferences/PreferencesDialog.tscn b/src/Preferences/PreferencesDialog.tscn index 442d27497..83616ee93 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -8,7 +8,6 @@ [sub_resource type="ButtonGroup" id=1] [node name="PreferencesDialog" type="AcceptDialog"] -visible = true margin_left = -3.0 margin_top = 9.0 margin_right = 419.0 diff --git a/src/UI/Canvas/Canvas.gd b/src/UI/Canvas/Canvas.gd index 84f2583c2..1ceebbaed 100644 --- a/src/UI/Canvas/Canvas.gd +++ b/src/UI/Canvas/Canvas.gd @@ -50,10 +50,11 @@ func _input(event : InputEvent) -> void: # elif not get_viewport_rect().has_point(event.position): # return - #current_pixel = get_local_mouse_position() + location + # Do not use self.get_local_mouse_position() because it return unexpected + # value when shrink parameter is not equal to one. At godot version 3.2.3 var tmp_transform = get_canvas_transform().affine_inverse() var tmp_position = Global.main_viewport.get_local_mouse_position() - current_pixel = tmp_transform.basis_xform(tmp_position)+tmp_transform.origin + current_pixel = tmp_transform.basis_xform(tmp_position) + tmp_transform.origin + location if Global.has_focus: update()