From fff0fa4c3073b38fe1f2633bedf57a850dc748ba Mon Sep 17 00:00:00 2001 From: Norodix Date: Wed, 10 May 2023 17:55:17 +0200 Subject: [PATCH 1/3] Center window on current window --- addons/ggs/classes/ggs_utils.gd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/ggs/classes/ggs_utils.gd b/addons/ggs/classes/ggs_utils.gd index 9dcc78c5..fc99c6e6 100644 --- a/addons/ggs/classes/ggs_utils.gd +++ b/addons/ggs/classes/ggs_utils.gd @@ -65,9 +65,11 @@ static func window_clamp_to_screen(size: Vector2) -> Vector2: static func center_window() -> void: - var display_size: Vector2 = DisplayServer.screen_get_size() + var screen = DisplayServer.window_get_current_screen() + var display_size: Vector2 = DisplayServer.screen_get_size(screen) var window_size: Vector2 = DisplayServer.window_get_size() - var target_pos: Vector2 = (display_size / 2) - (window_size / 2) + var origin = Vector2(DisplayServer.screen_get_position(screen)) + var target_pos: Vector2 = origin + (display_size / 2) - (window_size / 2) DisplayServer.window_set_position(target_pos) From 6034b112aa5d4de6278f58902028ada797d78c5b Mon Sep 17 00:00:00 2001 From: Norodix Date: Wed, 10 May 2023 18:09:04 +0200 Subject: [PATCH 2/3] Add missing parameter --- addons/ggs/classes/ggs_utils.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/ggs/classes/ggs_utils.gd b/addons/ggs/classes/ggs_utils.gd index fc99c6e6..add6261b 100644 --- a/addons/ggs/classes/ggs_utils.gd +++ b/addons/ggs/classes/ggs_utils.gd @@ -67,7 +67,7 @@ static func window_clamp_to_screen(size: Vector2) -> Vector2: static func center_window() -> void: var screen = DisplayServer.window_get_current_screen() var display_size: Vector2 = DisplayServer.screen_get_size(screen) - var window_size: Vector2 = DisplayServer.window_get_size() + var window_size: Vector2 = DisplayServer.window_get_size(screen) var origin = Vector2(DisplayServer.screen_get_position(screen)) var target_pos: Vector2 = origin + (display_size / 2) - (window_size / 2) DisplayServer.window_set_position(target_pos) From 1fb15d2f9f9a23f0924799ded6a98ad46cbb710c Mon Sep 17 00:00:00 2001 From: Norodix Date: Fri, 12 May 2023 21:30:29 +0200 Subject: [PATCH 3/3] Add type hints, fix window id bug --- addons/ggs/classes/ggs_utils.gd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/ggs/classes/ggs_utils.gd b/addons/ggs/classes/ggs_utils.gd index add6261b..8eb97610 100644 --- a/addons/ggs/classes/ggs_utils.gd +++ b/addons/ggs/classes/ggs_utils.gd @@ -65,10 +65,10 @@ static func window_clamp_to_screen(size: Vector2) -> Vector2: static func center_window() -> void: - var screen = DisplayServer.window_get_current_screen() - var display_size: Vector2 = DisplayServer.screen_get_size(screen) - var window_size: Vector2 = DisplayServer.window_get_size(screen) - var origin = Vector2(DisplayServer.screen_get_position(screen)) + var screen_id: int = DisplayServer.window_get_current_screen() + var display_size: Vector2i = DisplayServer.screen_get_size(screen_id) + var window_size: Vector2i = DisplayServer.window_get_size() + var origin: Vector2i = DisplayServer.screen_get_position(screen_id) var target_pos: Vector2 = origin + (display_size / 2) - (window_size / 2) DisplayServer.window_set_position(target_pos)