Skip to content

Commit 4e6ac9b

Browse files
committed
Merge pull request #107787 from Riteo/certified-integer-moment
Wayland: Fix division by zero when scale is less than 1
2 parents bd90d69 + b60b680 commit 4e6ac9b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

platform/linuxbsd/wayland/wayland_thread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3829,7 +3829,7 @@ void WaylandThread::window_set_max_size(DisplayServer::WindowID p_window_id, con
38293829
ERR_FAIL_COND(!windows.has(p_window_id));
38303830
WindowState &ws = windows[p_window_id];
38313831

3832-
Vector2i logical_max_size = p_size / window_state_get_scale_factor(&ws);
3832+
Vector2i logical_max_size = scale_vector2i(p_size, 1 / window_state_get_scale_factor(&ws));
38333833

38343834
if (ws.wl_surface && ws.xdg_toplevel) {
38353835
xdg_toplevel_set_max_size(ws.xdg_toplevel, logical_max_size.width, logical_max_size.height);
@@ -3848,7 +3848,7 @@ void WaylandThread::window_set_min_size(DisplayServer::WindowID p_window_id, con
38483848
ERR_FAIL_COND(!windows.has(p_window_id));
38493849
WindowState &ws = windows[p_window_id];
38503850

3851-
Size2i logical_min_size = p_size / window_state_get_scale_factor(&ws);
3851+
Size2i logical_min_size = scale_vector2i(p_size, 1 / window_state_get_scale_factor(&ws));
38523852

38533853
if (ws.wl_surface && ws.xdg_toplevel) {
38543854
xdg_toplevel_set_min_size(ws.xdg_toplevel, logical_min_size.width, logical_min_size.height);

0 commit comments

Comments
 (0)