caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-01-11 15:23:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Fix reporting of monitor scale changes

Browse Source 
Content scale events would be emitted when a window surface entered or
left an output, but not when one of a window's current outputs had its
scale changed.
This commit is contained in:
Camilla Löwy
2022-06-14 18:46:47 +02:00
parent c3ad3d49ed
commit e37ba80b13
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wl_monitor.c
View File

@@ -113,6 +113,18 @@ static void outputHandleScale(void* userData,
struct _GLFWmonitor* monitor = userData;
monitor->wl.scale = factor;
for (_GLFWwindow* window = _glfw.windowListHead; window; window = window->next)
{
for (int i = 0; i < window->wl.monitorsCount; i++)
{
if (window->wl.monitors[i] == monitor)
{
_glfwUpdateContentScaleWayland(window);
break;
}
}
}
}
#ifdef WL_OUTPUT_NAME_SINCE_VERSION

1
src/wl_platform.h
View File

@@ -507,6 +507,7 @@ GLFWbool _glfwGetGammaRampWayland(_GLFWmonitor* monitor, GLFWgammaramp* ramp);
void _glfwSetGammaRampWayland(_GLFWmonitor* monitor, const GLFWgammaramp* ramp);
void _glfwAddOutputWayland(uint32_t name, uint32_t version);
void _glfwUpdateContentScaleWayland(_GLFWwindow* window);
GLFWbool _glfwInputTextWayland(_GLFWwindow* window, uint32_t scancode);
void _glfwAddSeatListenerWayland(struct wl_seat* seat);

6
src/wl_window.c
View File

@@ -334,7 +334,7 @@ static void resizeWindow(_GLFWwindow* window)
wl_surface_commit(window->wl.decorations.bottom.surface);
}
static void checkScaleChange(_GLFWwindow* window)
void _glfwUpdateContentScaleWayland(_GLFWwindow* window)
{
if (_glfw.wl.compositorVersion < WL_SURFACE_SET_BUFFER_SCALE_SINCE_VERSION)
return;
@@ -372,7 +372,7 @@ static void surfaceHandleEnter(void* userData,
window->wl.monitors[window->wl.monitorsCount++] = monitor;
checkScaleChange(window);
_glfwUpdateContentScaleWayland(window);
}
static void surfaceHandleLeave(void* userData,
@@ -392,7 +392,7 @@ static void surfaceHandleLeave(void* userData,
}
window->wl.monitors[--window->wl.monitorsCount] = NULL;
checkScaleChange(window);
_glfwUpdateContentScaleWayland(window);
}
static const struct wl_surface_listener surfaceListener =