From 7cebb37c935892952b58b7166fa7da1dc2c15bf9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 25 Mar 2024 17:55:40 +0530 Subject: [PATCH] Use up-to-date scale in layer shell callback --- kitty/glfw.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kitty/glfw.c b/kitty/glfw.c index 827d09b2f..fa79860f8 100644 --- a/kitty/glfw.c +++ b/kitty/glfw.c @@ -1084,15 +1084,10 @@ calculate_layer_shell_window_size( } float xscale, yscale; glfwGetWindowContentScale(window, &xscale, &yscale); - FONTS_DATA_HANDLE fonts_data; + double xdpi, ydpi; + dpi_from_scale(xscale, yscale, &xdpi, &ydpi); OSWindow *os_window = os_window_for_glfw_window(window); - if (os_window) { - fonts_data = os_window->fonts_data; - } else { - double xdpi, ydpi; - dpi_from_scale(xscale, yscale, &xdpi, &ydpi); - fonts_data = load_fonts_data(OPT(font_size), xdpi, ydpi); - } + FONTS_DATA_HANDLE fonts_data = load_fonts_data(os_window ? os_window->fonts_data->font_sz_in_pts : OPT(font_size), xdpi, ydpi); if (config->edge == GLFW_EDGE_LEFT || config->edge == GLFW_EDGE_RIGHT) { if (!*height) *height = monitor_height; double spacing = edge_spacing(GLFW_EDGE_LEFT) + edge_spacing(GLFW_EDGE_RIGHT);