ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save main window position so that it can be restored at same location and size.

This commit is contained in:
mjbudd77 2021-08-10 20:50:49 -04:00
parent e406583256
commit 8e798cbbb9
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/drivers/Qt/ConsoleWindow.cpp
View File

@ -99,7 +99,7 @@
consoleWin_t::consoleWin_t(QWidget *parent) consoleWin_t::consoleWin_t(QWidget *parent)
: QMainWindow( parent ) : QMainWindow( parent )
{ {
int opt, xWinSize = 256, yWinSize = 240; int opt, xWinPos = -1, yWinPos = -1, xWinSize = 256, yWinSize = 240;
int use_SDL_video = false; int use_SDL_video = false;
int setFullScreen = false; int setFullScreen = false;
@ -181,12 +181,19 @@ consoleWin_t::consoleWin_t(QWidget *parent)
} }
g_config->getOption( "SDL.WinPosX" , &xWinPos );
g_config->getOption( "SDL.WinPosY" , &yWinPos );
g_config->getOption( "SDL.WinSizeX", &xWinSize ); g_config->getOption( "SDL.WinSizeX", &xWinSize );
g_config->getOption( "SDL.WinSizeY", &yWinSize ); g_config->getOption( "SDL.WinSizeY", &yWinSize );
if ( (xWinSize >= 256) && (yWinSize >= 224) ) if ( (xWinSize >= 256) && (yWinSize >= 224) )
{ {
this->resize( xWinSize, yWinSize ); this->resize( xWinSize, yWinSize );
if ( (xWinPos >= 0) && (yWinPos >= 0) )
{
this->move( xWinPos, yWinPos );
}
} }
else else
{ {
@ -235,10 +242,10 @@ consoleWin_t::~consoleWin_t(void)
QClipboard *clipboard; QClipboard *clipboard;
// Save window size and image scaling parameters at app exit. // Save window size and image scaling parameters at app exit.
w = consoleWindow->size(); w = size();
// Only Save window size if not fullscreen and not maximized // Only Save window size if not fullscreen and not maximized
if ( !consoleWindow->isFullScreen() && !consoleWindow->isMaximized() ) if ( !isFullScreen() && !isMaximized() )
{ {
// Scaling is only saved when applying video settings // Scaling is only saved when applying video settings
//if ( viewport_GL != NULL ) //if ( viewport_GL != NULL )
@ -252,9 +259,23 @@ consoleWin_t::~consoleWin_t(void)
// g_config->setOption( "SDL.YScale", viewport_SDL->getScaleY() ); // g_config->setOption( "SDL.YScale", viewport_SDL->getScaleY() );
//} //}
g_config->setOption( "SDL.WinPosX" , pos().x() );
g_config->setOption( "SDL.WinPosY" , pos().y() );
g_config->setOption( "SDL.WinSizeX", w.width() ); g_config->setOption( "SDL.WinSizeX", w.width() );
g_config->setOption( "SDL.WinSizeY", w.height() ); g_config->setOption( "SDL.WinSizeY", w.height() );
} }
else
{
QRect rect = normalGeometry();
if ( rect.isValid() )
{
g_config->setOption( "SDL.WinPosX" , rect.x() );
g_config->setOption( "SDL.WinPosY" , rect.y() );
g_config->setOption( "SDL.WinSizeX", rect.width() );
g_config->setOption( "SDL.WinSizeY", rect.height() );
}
}
g_config->save(); g_config->save();
// Signal Emulator Thread to Stop // Signal Emulator Thread to Stop

2
src/drivers/Qt/config.cpp
View File

@ -526,6 +526,8 @@ InitConfig()
config->addOption('y', "yres", "SDL.YResolution", 0); config->addOption('y', "yres", "SDL.YResolution", 0);
config->addOption("SDL.LastXRes", 0); config->addOption("SDL.LastXRes", 0);
config->addOption("SDL.LastYRes", 0); config->addOption("SDL.LastYRes", 0);
config->addOption("SDL.WinPosX" , 0);
config->addOption("SDL.WinPosY" , 0);
config->addOption("SDL.WinSizeX", 0); config->addOption("SDL.WinSizeX", 0);
config->addOption("SDL.WinSizeY", 0); config->addOption("SDL.WinSizeY", 0);
config->addOption("doublebuf", "SDL.DoubleBuffering", 1); config->addOption("doublebuf", "SDL.DoubleBuffering", 1);