mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get toplevel GtkWindow if parent is a child frame

Browse Source 
Change-Id: I9645259dd8c7fb331b2efab3f441422ee1f07c12
Reviewed-on: https://gerrit.libreoffice.org/79599
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-09-26 12:19:57 +01:00
parent 622a11cf60
commit 70e5fbcf28
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vcl/unx/gtk3/gtk3gtkframe.cxx
View File

@@ -1073,17 +1073,18 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
updateWMClass(); 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) ) );
if (GTK_IS_WINDOW(m_pWindow)) if (GTK_IS_WINDOW(m_pWindow))
{ {
if (m_pParent) if (m_pParent)
{ {
GtkWidget* pTopLevel = gtk_widget_get_toplevel(m_pParent->m_pWindow);
if (!isChild())
gtk_window_set_screen(GTK_WINDOW(m_pWindow), gtk_window_get_screen(GTK_WINDOW(pTopLevel)));
if (!(m_pParent->m_nStyle & SalFrameStyleFlags::PLUG)) if (!(m_pParent->m_nStyle & SalFrameStyleFlags::PLUG))
gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), GTK_WINDOW(m_pParent->m_pWindow) ); gtk_window_set_transient_for(GTK_WINDOW(m_pWindow), GTK_WINDOW(pTopLevel));
m_pParent->m_aChildren.push_back( this ); m_pParent->m_aChildren.push_back( this );
gtk_window_group_add_window(gtk_window_get_group(GTK_WINDOW(m_pParent->m_pWindow)), GTK_WINDOW(m_pWindow)); gtk_window_group_add_window(gtk_window_get_group(GTK_WINDOW(pTopLevel)), GTK_WINDOW(m_pWindow));
} }
else else
{ {