diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 09:38:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 09:39:34 +0000 |
| commit | 68d200f490a7a21c365bf43c710c46a87f84483d (patch) | |
| tree | 88f59c64eaaebdc61f9f5397518df46027464d53 | |
| parent | 7f25a5a0736c90a70d58fde6afaddd1ae4c24cb6 (diff) | |
gtk3: set decoration bits etc before realize
cause wayland is sticking a title bar into the toolbars otherwise, sigh
Change-Id: Id012e9508cc0dfafbda344974a96d8a038c6c9f4
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 9c8850672c06..1e69fe3d86b2 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1221,8 +1221,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) m_pParent->m_aChildren.push_back( this ); } - InitCommon(); - // set window type bool bDecoHandling = ! isChild() && @@ -1252,10 +1250,13 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) } gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType ); gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC ); + gtk_window_set_resizable( GTK_WINDOW(m_pWindow), bool(nStyle & SalFrameStyleFlags::SIZEABLE) ); } else if( (nStyle & SalFrameStyleFlags::FLOAT) ) gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), GDK_WINDOW_TYPE_HINT_POPUP_MENU ); + InitCommon(); + if( eWinType == GTK_WINDOW_TOPLEVEL ) { #ifdef ENABLE_GMENU_INTEGRATION @@ -1264,13 +1265,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) #endif } - - if( bDecoHandling ) - { - gtk_window_set_resizable( GTK_WINDOW(m_pWindow), bool(nStyle & SalFrameStyleFlags::SIZEABLE) ); - if( ( (nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION)) ) ) - gtk_window_set_accept_focus(GTK_WINDOW(m_pWindow), false); - } } GdkNativeWindow GtkSalFrame::findTopLevelSystemWindow( GdkNativeWindow aWindow ) |