| 1 |
From 0ee0e8010f986b67d696111ff4ea269ccf904aba Mon Sep 17 00:00:00 2001 |
| 2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
Date: Mon, 14 Mar 2016 12:50:56 +0000 |
| 4 |
Subject: [PATCH] Resolves: tdf#98638 sometimes menu grab doesn't take |
| 5 |
|
| 6 |
due to older timestamp vs earlier grab. Which suggests we should probably use |
| 7 |
GDK_CURRENT_TIME everywhere or (probably better) use gtk_get_current_event_time |
| 8 |
everywhere |
| 9 |
|
| 10 |
Change-Id: Ie04ab254b9fea423143cc9a129d2eecb683ed300 |
| 11 |
--- |
| 12 |
vcl/unx/gtk3/gtk3gtkframe.cxx | 8 ++++---- |
| 13 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx |
| 16 |
index bdd5499..742f812 100644 |
| 17 |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx |
| 18 |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx |
| 19 |
@@ -2078,9 +2078,9 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) |
| 20 |
GdkDeviceManager* pDeviceManager = gdk_display_get_device_manager(getGdkDisplay()); |
| 21 |
GdkDevice* pPointer = gdk_device_manager_get_client_pointer(pDeviceManager); |
| 22 |
if (bGrab) |
| 23 |
- gdk_device_grab(pPointer, widget_get_window(getMouseEventWidget()), GDK_OWNERSHIP_NONE, bOwnerEvents, (GdkEventMask) nMask, m_pCurrentCursor, GDK_CURRENT_TIME); |
| 24 |
+ gdk_device_grab(pPointer, widget_get_window(getMouseEventWidget()), GDK_OWNERSHIP_NONE, bOwnerEvents, (GdkEventMask) nMask, m_pCurrentCursor, gtk_get_current_event_time()); |
| 25 |
else |
| 26 |
- gdk_device_ungrab(pPointer, GDK_CURRENT_TIME); |
| 27 |
+ gdk_device_ungrab(pPointer, gtk_get_current_event_time()); |
| 28 |
} |
| 29 |
|
| 30 |
void GtkSalFrame::grabKeyboard( bool bGrab ) |
| 31 |
@@ -2098,11 +2098,11 @@ void GtkSalFrame::grabKeyboard( bool bGrab ) |
| 32 |
if (bGrab) |
| 33 |
{ |
| 34 |
gdk_device_grab(pKeyboard, widget_get_window(m_pWindow), GDK_OWNERSHIP_NONE, |
| 35 |
- true, (GdkEventMask)(GDK_KEY_PRESS | GDK_KEY_RELEASE), nullptr, GDK_CURRENT_TIME); |
| 36 |
+ true, (GdkEventMask)(GDK_KEY_PRESS | GDK_KEY_RELEASE), nullptr, gtk_get_current_event_time()); |
| 37 |
} |
| 38 |
else |
| 39 |
{ |
| 40 |
- gdk_device_ungrab(pKeyboard, GDK_CURRENT_TIME); |
| 41 |
+ gdk_device_ungrab(pKeyboard, gtk_get_current_event_time()); |
| 42 |
} |
| 43 |
} |
| 44 |
|
| 45 |
-- |
| 46 |
2.7.1 |
| 47 |
|
Parent Directory
| 
Revision Log