vcl/unx/gtk3/gtkinst.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit cc94c93bf2cf64ecbef835b1410ffc1a2bf40353
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jun 29 16:41:38 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jun 29 20:18:59 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 <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 1be34140abeb..2cba3cb6f10d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -434,13 +434,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
