diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-03 09:41:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-03 09:45:46 +0000 |
| commit | 69d79abb583fa20e7bc2d3a217f870ec750609be (patch) | |
| tree | cc2cfa7bd372e76fa39eb061f8f6e2c5a8270360 /vcl | |
| parent | 38dc4ea8992f74e15951cc0bc7e378fe1857c604 (diff) | |
Related: rhbz#1390607 our side of per-monitor fullscreen on wayland
keep the move window to monitor code, so under X, gnome#773857 isn't
a problem
when gnome#772525 fix is available this presumably will then work under
wayland
Change-Id: I50cfe7ede8a4f1404c26d174ef3c5bb920eb5044
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d377f32fdead..9c647cbf82a8 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1809,7 +1809,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, SetType eType, Rectangle * bool bSpanAllScreens = nNewScreen == (unsigned int)-1; m_bSpanMonitorsWhenFullscreen = bSpanAllScreens && getDisplay()->getSystem()->GetDisplayScreenCount() > 1; - + gint nMonitor = -1; if (m_bSpanMonitorsWhenFullscreen) //span all screens { pScreen = gtk_widget_get_screen( m_pWindow ); @@ -1820,7 +1820,6 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, SetType eType, Rectangle * } else { - gint nMonitor; bool bSameMonitor = false; if (!bSpanAllScreens) @@ -1906,7 +1905,19 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, SetType eType, Rectangle * ? GDK_FULLSCREEN_ON_ALL_MONITORS : GDK_FULLSCREEN_ON_CURRENT_MONITOR ); #endif if( eType == SetType::Fullscreen ) - gtk_window_fullscreen( GTK_WINDOW( m_pWindow ) ); + { + if (m_bSpanMonitorsWhenFullscreen) + gtk_window_fullscreen(GTK_WINDOW(m_pWindow)); + else + { +#if GTK_CHECK_VERSION(3,18,0) + gtk_window_fullscreen_on_monitor(GTK_WINDOW(m_pWindow), pScreen, nMonitor); +#else + gtk_window_fullscreen(GTK_WINDOW(m_pWindow)); +#endif + } + + } else if( eType == SetType::UnFullscreen ) gtk_window_unfullscreen( GTK_WINDOW( m_pWindow ) ); |