vcl/unx/gtk/gtksalframe.cxx | 10 ++++++---- vcl/unx/gtk3/gtk3gtkdata.cxx | 2 ++ vcl/unx/gtk3/gtk3gtkframe.cxx | 10 ++++++---- 3 files changed, 14 insertions(+), 8 deletions(-)
New commits: commit 8bac7e410adfb991ba847a2ca94400b3e655d1b1 Author: Caolán McNamara <[email protected]> Date: Tue Mar 1 09:33:39 2016 +0000 gtk3: gdk_x11_display_set_window_scale needs 3.10.0 Change-Id: I4c86082eca0e7618de30841e6fe7040be7326098 diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 27cf00e..3480fe1 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -82,6 +82,7 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) : m_bX11Display = GDK_IS_X11_DISPLAY( m_pGdkDisplay ); +#if GTK_CHECK_VERSION(3,10,0) #ifdef GDK_WINDOWING_X11 if (m_bX11Display) { @@ -91,6 +92,7 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) : } } #endif +#endif gtk_widget_set_default_direction(AllSettings::GetLayoutRTL() ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR); } commit 60fdfda3d05fe34ce74456f5bb6c6eb965963176 Author: Caolán McNamara <[email protected]> Date: Mon Feb 29 15:38:31 2016 +0000 replace SetExtendedFrameStyle + m_nExtStyle hack to direct updateWMClass call Change-Id: I2b7dd0ea24794d08557620dda8ca1de71244ec61 diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 8654695..476b4e9 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 99d3676..cfb856b 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) ) );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
