[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8bb24cf81ba59537e58ebb1c6049ba2fa54be7b2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 29 16:41:38 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 29 21:33:45 2021 +0200

    gtk3: match VCL_INPUT_ANY with or without TIMER if there's pending gdk events
    
    Change-Id: Ia3ab9993569a5eac8a1811c0187c4256dce72d50
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118125
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit cc94c93bf2cf64ecbef835b1410ffc1a2bf40353)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118101

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a58fd1a295a4..65427f880bed 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -433,13 +433,18 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
     if( (nType & VclInputFlags::TIMER) && IsTimerExpired() )
         return true;
 
+    // strip timer bits now
+    nType = nType & ~VclInputFlags::TIMER;
+
+    static constexpr VclInputFlags ANY_INPUT_EXCLUDING_TIMER = VCL_INPUT_ANY & ~VclInputFlags::TIMER;
+
 #if !GTK_CHECK_VERSION(4, 0, 0)
     GdkDisplay* pDisplay = gdk_display_get_default();
     if (!gdk_display_has_pending(pDisplay))
         return false;
 #endif
 
-    if (nType == VCL_INPUT_ANY)
+    if (nType == ANY_INPUT_EXCLUDING_TIMER)
         return true;
 
     bool bRet = false;