diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-06 21:03:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-06 21:08:41 +0000 |
| commit | 1b2bb1c952a3e8dc5c625c7a9f0042f06ba1c9a0 (patch) | |
| tree | dd70f29e9c9fd0afdd22e404c4793fd313c1c98b | |
| parent | 403f29480ff9a679eba6a93ef7d43ffaa6d7f518 (diff) | |
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
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 0f22d4661373..74649cb9d45d 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -546,6 +546,7 @@ public: guint* pGdkKeyCode, GdkModifierType *pGdkModifiers); static guint32 GetLastInputEventTime(); + static void UpdateLastInputEventTime(guint32 nUserInputTime); }; #define OOO_TYPE_FIXED ooo_fixed_get_type() 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<GtkSalMenu*>(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; } |