fly/flightgear
1
0
Fork 0
Code Activity

toggle fullscreen: also adapt GUI plane when resizing

Browse source
This commit is contained in:
ThorstenB 2012-11-18 00:00:15 +01:00
parent b577ec70fc
commit 01617861ce
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Viewer/fg_os_osgviewer.cxx
View file

@ -351,14 +351,17 @@ void fgOSFullScreen()
<< x << ", " << y << ") x (" << width << ", " << height << "), fullscreen: " << isFullScreen); << x << ", " << y << ") x (" << width << ", " << height << "), fullscreen: " << isFullScreen);
if (isFullScreen) if (isFullScreen)
{ {
// disable fullscreen mode, restore previous window size/coordinates
window->setWindowDecoration(true);
// limit x,y coordinates and window size to screen area // limit x,y coordinates and window size to screen area
if (previous_x + previous_width > (int)screenWidth) if (previous_x + previous_width > (int)screenWidth)
previous_x = 0; previous_x = 0;
if (previous_y + previous_height > (int)screenHeight) if (previous_y + previous_height > (int)screenHeight)
previous_y = 0; previous_y = 0;
window->setWindowRectangle(previous_x, previous_y, previous_width, previous_height);
// disable fullscreen mode, restore previous window size/coordinates
x = previous_x;
y = previous_y;
width = previous_width;
height = previous_height;
} }
else else
{ {
@ -368,11 +371,20 @@ void fgOSFullScreen()
previous_width = width; previous_width = width;
previous_height = height; previous_height = height;
// enable fullscreen // enable fullscreen mode, set new width/height
window->setWindowDecoration(false); x = 0;
window->setWindowRectangle(0, 0, screenWidth, screenHeight); y = 0;
width = screenWidth;
height = screenHeight;
} }
// set xsize/ysize properties to adapt GUI planes
fgSetInt("/sim/startup/xsize", width);
fgSetInt("/sim/startup/ysize", height);
// reconfigure window
window->setWindowDecoration(isFullScreen);
window->setWindowRectangle(x, y, width, height);
window->grabFocusIfPointerInWindow(); window->grabFocusIfPointerInWindow();
} }
} }