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

Correctly save and restore screen resolution from icfg file

Browse source
This commit is contained in:
Nimetu 2015-11-12 23:47:23 +02:00
parent 725b28a8ce
commit 7f7e4bcfb4
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -1761,6 +1761,8 @@ bool CInterfaceManager::loadConfig (const string &filename)
// *** If saved resolution is different from the current one setuped, must fix positions in _Modes // *** If saved resolution is different from the current one setuped, must fix positions in _Modes
if(lastInGameScreenResLoaded) if(lastInGameScreenResLoaded)
{ {
// Temporarily set screen to saved size so that positions are correctly calculated
CWidgetManager::getInstance()->setScreenWH(_LastInGameScreenW, _LastInGameScreenH);
// NB: we are typically InGame here (even though the _InGame flag is not yet set) // NB: we are typically InGame here (even though the _InGame flag is not yet set)
// Use the screen size of the config file. Don't update current UI, just _Modes // Use the screen size of the config file. Don't update current UI, just _Modes
CWidgetManager::getInstance()->moveAllWindowsToNewScreenSize(ClientCfg.Width, ClientCfg.Height, false); CWidgetManager::getInstance()->moveAllWindowsToNewScreenSize(ClientCfg.Width, ClientCfg.Height, false);
@ -2018,6 +2020,9 @@ void CInterfaceManager::updateDesktops( uint32 newScreenW, uint32 newScreenH )
CWidgetManager::getInstance()->getNewWindowCoordToNewScreenSize(gcCont.X, gcCont.Y, gcCont.W, gcCont.H ,newScreenW, newScreenH); CWidgetManager::getInstance()->getNewWindowCoordToNewScreenSize(gcCont.X, gcCont.Y, gcCont.W, gcCont.H ,newScreenW, newScreenH);
} }
} }
_LastInGameScreenW = newScreenW;
_LastInGameScreenH = newScreenH;
} }
class InvalidateTextVisitor : public CInterfaceElementVisitor class InvalidateTextVisitor : public CInterfaceElementVisitor