diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-29 15:38:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-01 09:34:18 +0000 |
| commit | 60fdfda3d05fe34ce74456f5bb6c6eb965963176 (patch) | |
| tree | fe32f02155edf0a21eeb5cb5e00d8815fadc053f /vcl/unx | |
| parent | c6eb232cb7b2a1fc58edb379463d1aa589973af4 (diff) | |
replace SetExtendedFrameStyle + m_nExtStyle hack to direct updateWMClass call
Change-Id: I2b7dd0ea24794d08557620dda8ca1de71244ec61
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 865469558ef5..476b4e997e38 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1234,10 +1234,12 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", const_cast<char *>(LIBO_VERSION_DOTTED)); // force wm class hint - m_nExtStyle = ~0; - if (m_pParent) - m_sWMClass = m_pParent->m_sWMClass; - SetExtendedFrameStyle( 0 ); + if (!isChild()) + { + if (m_pParent) + m_sWMClass = m_pParent->m_sWMClass; + updateWMClass(); + } if( m_pParent && m_pParent->m_pWindow && ! isChild() ) gtk_window_set_screen( GTK_WINDOW(m_pWindow), gtk_window_get_screen( GTK_WINDOW(m_pParent->m_pWindow) ) ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 99d3676ff0a6..cfb856b6b9fc 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1195,10 +1195,12 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", const_cast<char *>(LIBO_VERSION_DOTTED)); // force wm class hint - m_nExtStyle = ~0; - if (m_pParent) - m_sWMClass = m_pParent->m_sWMClass; - SetExtendedFrameStyle( 0 ); + if (!isChild()) + { + if (m_pParent) + m_sWMClass = m_pParent->m_sWMClass; + updateWMClass(); + } if( m_pParent && m_pParent->m_pWindow && ! isChild() ) gtk_window_set_screen( GTK_WINDOW(m_pWindow), gtk_window_get_screen( GTK_WINDOW(m_pParent->m_pWindow) ) ); |