[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 16 19:44:32 UTC 2021


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

New commits:
commit 04895980c096826a63b10ec648627b5007b0a884
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 16 14:30:26 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 16 21:43:41 2021 +0200

    gtk4: Notebook label is now inside another widget
    
    Change-Id: If1f37959603dbe10e01d492321e9324ab55f10d6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117333
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6ac555d63d95..8253392cf306 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -8140,7 +8140,12 @@ private:
             for (gint i = 0; i < nPages; ++i)
             {
                 GtkWidget* pTabWidget = gtk_notebook_get_tab_label(m_pNotebook, gtk_notebook_get_nth_page(m_pNotebook, i));
-                if (!gtk_widget_get_child_visible(pTabWidget))
+#if GTK_CHECK_VERSION(4, 0, 0)
+                bool bTabVisible = gtk_widget_get_child_visible(gtk_widget_get_parent(pTabWidget));
+#else
+                bool bTabVisible = gtk_widget_get_child_visible(pTabWidget);
+#endif
+                if (!bTabVisible)
                 {
                     m_nLaunchSplitTimeoutId = g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, reinterpret_cast<GSourceFunc>(launch_split_notebooks), this, nullptr);
                     break;


More information about the Libreoffice-commits mailing list