Merge pull request #106083 from Riteo/pointing-somewhere

Repiteo · Repiteo · commit 8ab73248bc9d · 2025-05-05T11:24:18.000-05:00
Wayland: Ensure pointed window's existence in `mouse_get_position`
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -453,15 +453,13 @@ Point2i DisplayServerWayland::mouse_get_position() const {
 
 	WindowID pointed_id = wayland_thread.pointer_get_pointed_window_id();
 
-	if (pointed_id != INVALID_WINDOW_ID) {
+	if (pointed_id != INVALID_WINDOW_ID && windows.has(pointed_id)) {
 		return Input::get_singleton()->get_mouse_position() + windows[pointed_id].rect.position;
 	}
 
 	// We can't properly implement this method by design.
 	// This is the best we can do unfortunately.
 	return Input::get_singleton()->get_mouse_position();
-
-	return Point2i();
 }
 
 BitField<MouseButtonMask> DisplayServerWayland::mouse_get_button_state() const {

Original file line number	Diff line number	Diff line change
`@@ -453,15 +453,13 @@ Point2i DisplayServerWayland::mouse_get_position() const {`
`453`	`453`
`454`	`454`	`WindowID pointed_id = wayland_thread.pointer_get_pointed_window_id();`
`455`	`455`
`456`		`- if (pointed_id != INVALID_WINDOW_ID) {`
	`456`	`+ if (pointed_id != INVALID_WINDOW_ID && windows.has(pointed_id)) {`
`457`	`457`	`return Input::get_singleton()->get_mouse_position() + windows[pointed_id].rect.position;`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`// We can't properly implement this method by design.`
`461`	`461`	`// This is the best we can do unfortunately.`
`462`	`462`	`return Input::get_singleton()->get_mouse_position();`
`463`		`-`
`464`		`- return Point2i();`
`465`	`463`	`}`
`466`	`464`
`467`	`465`	`BitField<MouseButtonMask> DisplayServerWayland::mouse_get_button_state() const {`