blob: 6785c55bb55fd81bd1aefcbb429961cc8d71502d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -2879,6 +2879,10 @@
return;
}
+ LOG(" requesting xdg-activation token, surface ID %d serial %d seat ID %d",
+ wl_proxy_get_id((struct wl_proxy*)focusSurface), focusSerial,
+ wl_proxy_get_id((struct wl_proxy*)KeymapWrapper::GetSeat()));
+
// Store activation token at activated window for further release.
g_clear_pointer(&aWindow->mXdgToken, xdg_activation_token_v1_destroy);
aWindow->mXdgToken = xdg_activation_v1_get_activation_token(xdg_activation);
@@ -2941,6 +2945,7 @@
nsGTKToolkit* GTKToolkit = nsGTKToolkit::GetToolkit();
if (GTKToolkit) {
timestamp = GTKToolkit->GetFocusTimestamp();
+ GTKToolkit->SetFocusTimestamp(0);
}
if (!timestamp) {
timestamp = GetLastUserInputTime();
@@ -2955,7 +2960,6 @@
RequestFocusWaylandWindow(toplevelWindow);
}
#endif
- if (GTKToolkit) GTKToolkit->SetFocusTimestamp(0);
}
return;
}
|
