Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-14 06:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Clean up monitor scale update

Browse Source 
(cherry picked from commit 20adc18aa5)
This commit is contained in:
Camilla Löwy 2022-01-01 20:18:33 +01:00
parent 9340324380
commit 09470b68c1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wl_window.c
View File

@ -404,27 +404,25 @@ static void resizeWindow(_GLFWwindow* window)
static void checkScaleChange(_GLFWwindow* window) static void checkScaleChange(_GLFWwindow* window)
{ {
int scale = 1;
int i;
int monitorScale;
// Check if we will be able to set the buffer scale or not. // Check if we will be able to set the buffer scale or not.
if (_glfw.wl.compositorVersion < 3) if (_glfw.wl.compositorVersion < 3)
return; return;
// Get the scale factor from the highest scale monitor. // Get the scale factor from the highest scale monitor.
for (i = 0; i < window->wl.monitorsCount; ++i) int maxScale = 1;
for (int i = 0; i < window->wl.monitorsCount; i++)
{ {
monitorScale = window->wl.monitors[i]->wl.scale; const int scale = window->wl.monitors[i]->wl.scale;
if (scale < monitorScale) if (maxScale < scale)
scale = monitorScale; maxScale = scale;
} }
// Only change the framebuffer size if the scale changed. // Only change the framebuffer size if the scale changed.
if (scale != window->wl.scale) if (window->wl.scale != maxScale)
{ {
window->wl.scale = scale; window->wl.scale = maxScale;
wl_surface_set_buffer_scale(window->wl.surface, scale); wl_surface_set_buffer_scale(window->wl.surface, maxScale);
resizeWindow(window); resizeWindow(window);
} }
} }