vcl/unx/gtk3/gtkinst.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9ed7d6241ce7f0b818c8eec43d2b7db1537047a4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jun 1 09:30:15 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jun 1 12:20:03 2021 +0200
gtk4: use gtk_window_is_active for has_toplevel_focus
Change-Id: I1a49ee4aed6751bee0a26f8a0e2a3dc2bc87be3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116519
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 bd775e9e5a78..b6b5a3ff2a75 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -5359,10 +5359,10 @@ public:
virtual bool has_toplevel_focus() const override
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
- return gtk_window_has_toplevel_focus(m_pWindow);
+#if GTK_CHECK_VERSION(4, 0, 0)
+ return gtk_window_is_active(m_pWindow);
#else
- return false;
+ return gtk_window_has_toplevel_focus(m_pWindow);
#endif
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
