KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get the window geometry with CSD fully correct (I think)

Browse Source 
The co-ordinates are in the surface co-ordinate system. When the
compositor specifies sizes it apparently adds one subsurface size
in both x and y directions, not both. Possibly because the origin is
placed after the top and left subsurfaces. So modify it by adding
and extra subsurface size to that.
This commit is contained in:
Kovid Goyal 2021-04-07 14:16:57 +05:30
parent 5a1bd93518
commit 75ec801941
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glfw/wl_client_side_decorations.c vendored
View File

@ -395,14 +395,21 @@ void
set_csd_window_geometry(_GLFWwindow *window, int32_t *width, int32_t *height) {
bool has_csd = window->decorated && !window->wl.decorations.serverSide && window->wl.decorations.left.surface && !(window->wl.toplevel_states & TOPLEVEL_STATE_FULLSCREEN);
bool size_specified_by_compositor = *width > 0 && *height > 0;
if (!size_specified_by_compositor) { *width = window->wl.width; *height = window->wl.height; }
int32_t scale = window->wl.scale >= 1 ? window->wl.scale : 1;
if (size_specified_by_compositor) {
if (has_csd) {
*width += decs.metrics.width; *height += decs.metrics.width;
}
} else {
*width = window->wl.width; *height = window->wl.height;
}
struct { int32_t x, y, width, height; } geometry = {.x = 0, .y = 0, .width = *width, .height = *height};
if (has_csd) {
// I dont know why GNOME wants geometry.x to be zero, but thats what works
int32_t visible_titlebar_height = decs.metrics.top - decs.metrics.width;
geometry.y = -decs.metrics.width;
*height -= visible_titlebar_height;
geometry.y = -visible_titlebar_height;
*height -= decs.metrics.top;
*width -= decs.metrics.width;
geometry.width = *width;
geometry.height = *height + visible_titlebar_height;
}
xdg_surface_set_window_geometry(window->wl.xdg.surface, geometry.x * scale, geometry.y * scale, geometry.width * scale, geometry.height * scale);
xdg_surface_set_window_geometry(window->wl.xdg.surface, geometry.x, geometry.y, geometry.width, geometry.height);
}