CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-06-26 10:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Wayland: Fix initial font size wrong when using fractional scales

Browse source 
We have to check for window scale after window is shown as Wayland has
this crazy design where the compositor only sets fractional scale after
the window is shown. Which means kitty has to do useless work
calculating font metrics twice. Sigh.
This commit is contained in:
Kovid Goyal 2024-04-12 08:29:53 +05:30
parent 1c8fd0ccc4
commit 353a56dbbf
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
kitty/glfw.c
View file

@ -1208,19 +1208,21 @@ create_os_window(PyObject UNUSED *self, PyObject *args, PyObject *kw) {
if (pret == NULL) return NULL;
Py_DECREF(pret);
if (x != INT_MIN && y != INT_MIN) glfwSetWindowPos(glfw_window, x, y);
bool is_apple = true;
#ifndef __APPLE__
is_apple = false;
glfwShowWindow(glfw_window);
#endif
#ifdef __APPLE__
float n_xscale, n_yscale;
double n_xdpi, n_ydpi;
get_window_content_scale(glfw_window, &n_xscale, &n_yscale, &n_xdpi, &n_ydpi);
if (n_xdpi != xdpi || n_ydpi != ydpi) {
// this can happen if the window is moved by the OS to a different monitor when shown
xdpi = n_xdpi; ydpi = n_ydpi;
fonts_data = load_fonts_data(OPT(font_size), xdpi, ydpi);
if (global_state.is_wayland || is_apple) {
float n_xscale, n_yscale;
double n_xdpi, n_ydpi;
get_window_content_scale(glfw_window, &n_xscale, &n_yscale, &n_xdpi, &n_ydpi);
if (n_xdpi != xdpi || n_ydpi != ydpi) {
// this can happen if the window is moved by the OS to a different monitor when shown or with fractional scales on Wayland
xdpi = n_xdpi; ydpi = n_ydpi;
fonts_data = load_fonts_data(OPT(font_size), xdpi, ydpi);
}
}
#endif
if (is_first_window) {
PyObject *ret = PyObject_CallFunction(load_programs, "O", is_semi_transparent ? Py_True : Py_False);
if (ret == NULL) return NULL;