From 1b2bb1c952a3e8dc5c625c7a9f0042f06ba1c9a0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 6 Dec 2016 21:03:07 +0000 Subject: Resolves: rhbz#1401778 gtk3+wayland switching windows from the menu woes ignore 0 timestamps cause they're useless and get the current event time stamp during MenuBarReturnFocus to determine the timestamp of the menu command dispatch (cherry picked from commit adfcd16220444ef3ea318515c5a331210250e45f) Change-Id: Ia4b00aafc9ef47b41dcca2c160e943200db5c524 --- vcl/unx/gtk/gtksalmenu.cxx | 1 + vcl/unx/gtk3/gtk3gtkframe.cxx | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'vcl/unx') diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index c5cbb542c591..2cf072a01d5d 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -750,6 +750,7 @@ bool GtkSalMenu::TakeFocus() static void MenuBarReturnFocus(GtkMenuShell*, gpointer menu) { + GtkSalFrame::UpdateLastInputEventTime(gtk_get_current_event_time()); GtkSalMenu* pMenu = static_cast(menu); pMenu->ReturnFocus(); } diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d34eeed28566..eb8b718dbef5 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2039,8 +2039,13 @@ guint32 GtkSalFrame::GetLastInputEventTime() return nLastUserInputTime; } -static void UpdateLastInputEventTime(guint32 nUserInputTime) +void GtkSalFrame::UpdateLastInputEventTime(guint32 nUserInputTime) { + //gtk3 can generate a synthetic crossing event with a useless 0 + //(GDK_CURRENT_TIME) timestamp on showing a menu from the main + //menubar, which is unhelpful, so ignore the 0 timestamps + if (nUserInputTime == GDK_CURRENT_TIME) + return; nLastUserInputTime = nUserInputTime; } -- cgit v1.2.3