kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-11-15 07:04:31 +03:00
Code Issues Projects Releases Wiki Activity

_glfwPLatformSetWindowSize() should not be called when handling configure events as it does a bunch of work already done before

Browse Source
This commit is contained in:
Kovid Goyal 2021-04-07 19:55:15 +05:30
parent 4822fa989e
commit 82a5733ec5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glfw/wl_window.c vendored
View File

@ -237,13 +237,15 @@ clipboard_mime(void) {
return buf; return buf;
} }
static void dispatchChangesAfterConfigure(_GLFWwindow *window, int32_t width, int32_t height) { static void
dispatchChangesAfterConfigure(_GLFWwindow *window, int32_t width, int32_t height) {
bool size_changed = width != window->wl.width || height != window->wl.height; bool size_changed = width != window->wl.width || height != window->wl.height;
bool scale_changed = checkScaleChange(window); bool scale_changed = checkScaleChange(window);
if (size_changed) { if (size_changed) {
_glfwInputWindowSize(window, width, height); _glfwInputWindowSize(window, width, height);
_glfwPlatformSetWindowSize(window, width, height); window->wl.width = width; window->wl.height = height;
resizeFramebuffer(window);
} }
if (scale_changed) { if (scale_changed) {
@ -448,9 +450,9 @@ static void xdgToplevelHandleConfigure(void* data,
bool live_resize_done = !(new_states & TOPLEVEL_STATE_RESIZING) && (window->wl.toplevel_states & TOPLEVEL_STATE_RESIZING); bool live_resize_done = !(new_states & TOPLEVEL_STATE_RESIZING) && (window->wl.toplevel_states & TOPLEVEL_STATE_RESIZING);
window->wl.toplevel_states = new_states; window->wl.toplevel_states = new_states;
set_csd_window_geometry(window, &width, &height); set_csd_window_geometry(window, &width, &height);
debug("final window content size: %dx%d\n", window->wl.width, window->wl.height);
wl_surface_commit(window->wl.surface); wl_surface_commit(window->wl.surface);
dispatchChangesAfterConfigure(window, width, height); dispatchChangesAfterConfigure(window, width, height);
debug("final window content size: %dx%d\n", window->wl.width, window->wl.height);
_glfwInputWindowFocus(window, window->wl.toplevel_states & TOPLEVEL_STATE_ACTIVATED); _glfwInputWindowFocus(window, window->wl.toplevel_states & TOPLEVEL_STATE_ACTIVATED);
ensure_csd_resources(window); ensure_csd_resources(window);
if (live_resize_done) _glfwInputLiveResize(window, false); if (live_resize_done) _glfwInputLiveResize(window, false);