|
 |
da2ecd7 |
From 7f928c43729995b2402a6897a86bc2acf9679db0 Mon Sep 17 00:00:00 2001
|
|
|
da2ecd7 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
da2ecd7 |
Date: Thu, 10 Mar 2016 09:38:48 +0000
|
|
|
da2ecd7 |
Subject: [PATCH] gtk3: set decoration bits etc before realize
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
cause wayland is sticking a title bar into the toolbars otherwise, sigh
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
Change-Id: Id012e9508cc0dfafbda344974a96d8a038c6c9f4
|
|
|
da2ecd7 |
(cherry picked from commit 68d200f490a7a21c365bf43c710c46a87f84483d)
|
|
|
da2ecd7 |
---
|
|
|
da2ecd7 |
vcl/unx/gtk3/gtk3gtkframe.cxx | 12 +++---------
|
|
|
da2ecd7 |
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
da2ecd7 |
index d923a69..a5abe4a 100644
|
|
|
da2ecd7 |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
da2ecd7 |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
da2ecd7 |
@@ -1214,8 +1214,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
|
|
|
da2ecd7 |
g_object_unref(gtk_window_get_group(GTK_WINDOW(m_pWindow)));
|
|
|
da2ecd7 |
}
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
- InitCommon();
|
|
|
da2ecd7 |
-
|
|
|
da2ecd7 |
// set window type
|
|
|
da2ecd7 |
bool bDecoHandling =
|
|
|
da2ecd7 |
! isChild() &&
|
|
|
da2ecd7 |
@@ -1245,10 +1243,13 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
|
|
|
da2ecd7 |
}
|
|
|
da2ecd7 |
gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
|
|
|
da2ecd7 |
gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
|
|
|
da2ecd7 |
+ gtk_window_set_resizable( GTK_WINDOW(m_pWindow), bool(nStyle & SalFrameStyleFlags::SIZEABLE) );
|
|
|
da2ecd7 |
}
|
|
|
da2ecd7 |
else if( (nStyle & SalFrameStyleFlags::FLOAT) )
|
|
|
da2ecd7 |
gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), GDK_WINDOW_TYPE_HINT_POPUP_MENU );
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
+ InitCommon();
|
|
|
da2ecd7 |
+
|
|
|
da2ecd7 |
if( eWinType == GTK_WINDOW_TOPLEVEL )
|
|
|
da2ecd7 |
{
|
|
|
da2ecd7 |
#ifdef ENABLE_GMENU_INTEGRATION
|
|
|
da2ecd7 |
@@ -1257,13 +1258,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
|
|
|
da2ecd7 |
#endif
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
}
|
|
|
da2ecd7 |
-
|
|
|
da2ecd7 |
- if( bDecoHandling )
|
|
|
da2ecd7 |
- {
|
|
|
da2ecd7 |
- gtk_window_set_resizable( GTK_WINDOW(m_pWindow), bool(nStyle & SalFrameStyleFlags::SIZEABLE) );
|
|
|
da2ecd7 |
- if( ( (nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION)) ) )
|
|
|
da2ecd7 |
- gtk_window_set_accept_focus(GTK_WINDOW(m_pWindow), false);
|
|
|
da2ecd7 |
- }
|
|
|
da2ecd7 |
}
|
|
|
da2ecd7 |
|
|
|
da2ecd7 |
GdkNativeWindow GtkSalFrame::findTopLevelSystemWindow( GdkNativeWindow aWindow )
|
|
|
da2ecd7 |
--
|
|
|
da2ecd7 |
2.7.4
|
|
|
da2ecd7 |
|