From e95fcb791c1f5c70f58b851c1873ed74ad99271d Mon Sep 17 00:00:00 2001 From: Jiri Bohac Date: Fri, 7 Dec 2018 00:30:22 +0100 Subject: [PATCH] Fix fullscreen spanning multiple monitors Commit a16635c ("Fix fullscreen - remove all the garbage which breaks things and let Gtk do its job.") broke fullscreen spanning multiple monitors. Fix this for GTK3 by using gdk_window_set_fullscreen_mode(). Fixes #650. Unfortunately, GTK2 has no equivalent. --- src/fullscreen.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/fullscreen.c b/src/fullscreen.c index 048fe3f5..ac7e2935 100644 --- a/src/fullscreen.c +++ b/src/fullscreen.c @@ -248,13 +248,6 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd, gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE); gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); - /* make window fullscreen -- let Gtk do it's job, don't screw it in any way */ - gtk_window_fullscreen(GTK_WINDOW(fs->window)); - - /* move it to requested screen */ - if (options->fullscreen.screen >= 0) { - gtk_window_set_screen(GTK_WINDOW(fs->window), screen); - } /* keep window above others, if requested */ if (options->fullscreen.above) { @@ -281,6 +274,22 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd, GDK_HINT_WIN_GRAVITY | GDK_HINT_USER_POS | GDK_HINT_USER_SIZE); gtk_widget_realize(fs->window); +#if GTK_CHECK_VERSION(3,8,0) + if ((options->fullscreen.screen % 100) == 0) { + GdkWindow *gdkwin; + gdkwin = gtk_widget_get_window(fs->window); + if (gdkwin != NULL) + gdk_window_set_fullscreen_mode(gdkwin, GDK_FULLSCREEN_ON_ALL_MONITORS); + } +#endif + /* make window fullscreen -- let Gtk do it's job, don't screw it in any way */ + gtk_window_fullscreen(GTK_WINDOW(fs->window)); + + /* move it to requested screen */ + if (options->fullscreen.screen >= 0) { + gtk_window_set_screen(GTK_WINDOW(fs->window), screen); + + } fs->imd = image_new(FALSE); -- 2.20.1