mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 10:12:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the window context changing during show fix into glfw code

Browse Source 
It more logically belongs there.
This commit is contained in:
Kovid Goyal
2024-05-28 09:46:16 +05:30
parent 9837531b63
commit 55417e4269
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glfw/wl_window.c vendored
View File

@@ -896,6 +896,7 @@ attach_temp_buffer_during_window_creation(_GLFWwindow *window) {
static void
loop_till_window_fully_created(_GLFWwindow *window) {
if (!window->wl.window_fully_created) {
GLFWwindow *ctx = glfwGetCurrentContext();
debug("Waiting for compositor to send fractional scale for window %llu\n", window->id);
monotonic_t start = monotonic();
while (!window->wl.window_fully_created && monotonic() - start < ms_to_monotonic_t(300)) {
@@ -904,6 +905,9 @@ loop_till_window_fully_created(_GLFWwindow *window) {
}
}
window->wl.window_fully_created = true;
// If other OS windows were resized when this window is shown, the ctx might have been changed by
// user code, restore it to whatever it was at the start.
if (glfwGetCurrentContext() != ctx) glfwMakeContextCurrent(ctx);
}
}