From 0ff97d1350561a6b6eace20d381dd639c0d5a853 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 20 Jun 2011 09:28:39 +0000 Subject: [PATCH] Added check against Traits::overrideRedirct to prevent the fullscreen workaround being run when overrideRedirect is on as overrideRedirect switches off the window managers ability to manage the fullscreen so the problem doesn't need working around. --- src/osgViewer/GraphicsWindowX11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp index 59b23b300..7bbfbd677 100644 --- a/src/osgViewer/GraphicsWindowX11.cpp +++ b/src/osgViewer/GraphicsWindowX11.cpp @@ -878,7 +878,7 @@ bool GraphicsWindowX11::createWindow() wsi->getScreenResolution(*_traits, screenWidth, screenHeight); bool isFullScreen = x == 0 && y == 0 && width == (int)screenWidth && height == (int)screenHeight && !_traits->windowDecoration; - if (isFullScreen) + if (isFullScreen && !_traits->overrideRedirect) { // follows is hack to get around problems with toggling off full screen with modern X11 window // managers that try to be too clever when toggling off full screen and ignore the window size