Skip to content
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

Multi monitor related fixes #84

Merged
merged 7 commits into from
Feb 23, 2024
Merged

Multi monitor related fixes #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5c64f7
Prevent GoZen from going out of 'visible' screen bounds
ManpreetXSingh Feb 13, 2024
52709a7
Fix window disappearing when main screen's coordinates change
ManpreetXSingh Feb 13, 2024
23dc069
Fix extra window offset on screen position change
ManpreetXSingh Feb 13, 2024
f5dd693
Unhide titlebar only & "freely" drag b/w monitors
ManpreetXSingh Feb 13, 2024
0b1b8f4
Fix multi-monitor issue for resize handles
ManpreetXSingh Feb 13, 2024
494d751
Merge branch 'VoylinsGamedevJourney:master' into multi-monitor
ManpreetXSingh Feb 14, 2024
209ceeb
Merge branch 'master' into multi-monitor
ManpreetXSingh Feb 20, 2024
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
9 changes: 6 additions & 3 deletions src/ui/screen_main/scripts/main_resize_handles.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ func _on_gui_input(event: InputEvent, node: Control):

func _process(_delta: float) -> void:
if resizing:
var current_scene = get_tree().current_scene
var relative_mouse_pos = (
DisplayServer.mouse_get_position()
- DisplayServer.window_get_position(get_window().get_window_id())
)
if resize_node in [$Bottom, $Corner]:
get_window().size.y = int(current_scene.get_global_mouse_position().y)
get_window().size.y = int(relative_mouse_pos.y)
if resize_node in [$Right, $Corner]:
get_window().size.x = int(current_scene.get_global_mouse_position().x)
get_window().size.x = int(relative_mouse_pos.x)

#endregion
###############################################################
36 changes: 29 additions & 7 deletions src/ui/screen_main/scripts/main_top_bar.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ extends PanelContainer
var menu_buttons := []

var move_window := false
var move_start: Vector2i
var move_win_offset: Vector2i


func _ready() -> void:
Expand Down Expand Up @@ -92,15 +92,37 @@ var win_mode: Window.Mode:

func _on_top_bar_dragging(event) -> void:
if event is InputEventMouseButton and event.button_index == 1:
move_window = event.is_pressed() and win_mode == Window.MODE_WINDOWED
if move_window:
move_start = get_viewport().get_mouse_position()

var mouse_pos := DisplayServer.mouse_get_position()
var win_pos := DisplayServer.window_get_position(get_window().get_window_id())
move_window = false

if win_mode == Window.MODE_WINDOWED:
if event.is_pressed():
move_win_offset = mouse_pos - win_pos
move_window = true

elif OS.get_name() == "Windows":
var screen_rect := DisplayServer.screen_get_usable_rect(
DisplayServer.SCREEN_WITH_MOUSE_FOCUS
)
var tb_top := Vector2i(mouse_pos.x, win_pos.y)
var tb_bottom := Vector2i(mouse_pos.x, win_pos.y + int(size.y))

if !screen_rect.encloses(Rect2i(tb_top, tb_bottom)):
if tb_top.y < screen_rect.position.y:
get_window().position = (
tb_top.clamp(screen_rect.position, screen_rect.end)
- Vector2i(move_win_offset.x, 0)
)
else:
get_window().position = (
tb_bottom.clamp(screen_rect.position, screen_rect.end)
- Vector2i(move_win_offset.x, int(size.y))
)

func _process(_delta: float) -> void:
if move_window:
var mouse_delta = Vector2i(get_viewport().get_mouse_position()) - move_start
get_window().position += mouse_delta
get_window().position = DisplayServer.mouse_get_position() - move_win_offset

#endregion
###############################################################
Expand Down