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

[Caolán McNamara (via logerrit)]

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

New commits:
commit f1311618e29315526565797f6edf2918d58f0fe4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 10 16:40:35 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon May 10 20:57:30 2021 +0200

    gtk4: GDK_WINDOW_STATE_WITHDRAWN is gone
    
    Change-Id: Ibeca97ca0ac849d69b3b32db6d6f27da7cf551b7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115347
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index dd939debc62b..06d08ac42580 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1033,7 +1033,9 @@ void GtkSalFrame::InitCommon()
     m_nKeyModifiers     = ModKeyFlags::NONE;
     m_bFullscreen       = false;
     m_bSpanMonitorsWhenFullscreen = false;
-#if !GTK_CHECK_VERSION(4,0,0)
+#if GTK_CHECK_VERSION(4,0,0)
+    m_nState            = GDK_TOPLEVEL_STATE_MAXIMIZED;
+#else
     m_nState            = GDK_WINDOW_STATE_WITHDRAWN;
 #endif
     m_pIMHandler        = nullptr;
@@ -3946,12 +3948,14 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*, GdkEvent* pEvent, gpointer
         pThis->m_aRestorePosSize = GetPosAndSize(GTK_WINDOW(pThis->m_pWindow));
     }
 
+#if !GTK_CHECK_VERSION(4,0,0)
     if ((pEvent->window_state.new_window_state & GDK_WINDOW_STATE_WITHDRAWN) &&
         !(pThis->m_nState & GDK_WINDOW_STATE_WITHDRAWN))
     {
         if (pThis->isFloatGrabWindow())
             pThis->closePopup();
     }
+#endif
 
     pThis->m_nState = pEvent->window_state.new_window_state;