Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Windowed resolution resetting when closing from login/outgame views.

Browse source
This commit is contained in:
Nimetu 2017-01-12 13:29:47 +02:00
parent 9db20a28cb
commit 795c91bcc8
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/client/src/client_cfg.cpp
View file

@ -2043,13 +2043,9 @@ void CClientConfig::release ()
// Are we in window mode ? // Are we in window mode ?
if (ClientCfg.Windowed /* && !isWindowMaximized() */) if (ClientCfg.Windowed /* && !isWindowMaximized() */)
{ {
// Save windows position // Save windows position. width/height are saved when leaving ingame.
writeInt("PositionX", x); writeInt("PositionX", x);
writeInt("PositionY", y); writeInt("PositionY", y);
// Save windows size
writeInt("Width", std::max((sint)width, 800));
writeInt("Height", std::max((sint)height, 600));
} }
} }

17
code/ryzom/client/src/release.cpp
View file

@ -132,6 +132,19 @@ extern void selectTipsOfTheDay (uint tips);
// FUNCTIONS // // FUNCTIONS //
/////////////// ///////////////
// ***************************************************************************
// Saving ingame resolution when in windowed mode
static void saveIngameResolution()
{
if (ClientCfg.Windowed)
{
uint32 width, height;
Driver->getWindowSize(width, height);
ClientCfg.writeInt("Width", std::max((sint)width, 800));
ClientCfg.writeInt("Height", std::max((sint)height, 600));
}
}
// *************************************************************************** // ***************************************************************************
// 3D element release, called from both releaseMainLoopReselect() and releaseMainLoop() // 3D element release, called from both releaseMainLoopReselect() and releaseMainLoop()
static void releaseMainLoopScenes() static void releaseMainLoopScenes()
@ -209,6 +222,8 @@ void releaseMainLoopReselect()
{ {
ProgressBar.release(); ProgressBar.release();
saveIngameResolution();
CInterfaceManager *pIM= CInterfaceManager::getInstance(); CInterfaceManager *pIM= CInterfaceManager::getInstance();
// save keys loaded and interface cfg (not done in releaseMainLoop() because done at end of mainLoop()...) // save keys loaded and interface cfg (not done in releaseMainLoop() because done at end of mainLoop()...)
@ -364,6 +379,8 @@ void releaseMainLoop(bool closeConnection)
{ {
ProgressBar.release(); ProgressBar.release();
saveIngameResolution();
// Release R2 editor if applicable // Release R2 editor if applicable
R2::getEditor().autoConfigRelease(IsInRingSession); R2::getEditor().autoConfigRelease(IsInRingSession);