actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make the DisplayResolution option row deal with caching the resolution list, so it only happens on screens that use it.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2016-01-14 16:48:52 -07:00
parent 79f4037088
commit 0da27cad75
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsMasterPrefs.cpp
+10 -3
View File
@@ -251,12 +251,15 @@ static void ThemeChoices( vector<RString> &out )
static DisplayResolutions display_resolution_list; static DisplayResolutions display_resolution_list;
static void cache_display_resolution_list() static void cache_display_resolution_list()
{ {
display_resolution_list.clear(); if(display_resolution_list.empty())
DISPLAY->GetDisplayResolutions(display_resolution_list); {
DISPLAY->GetDisplayResolutions(display_resolution_list);
}
} }
static void DisplayResolutionChoices( vector<RString> &out ) static void DisplayResolutionChoices( vector<RString> &out )
{ {
cache_display_resolution_list();
FOREACHS_CONST( DisplayResolution, display_resolution_list, iter ) FOREACHS_CONST( DisplayResolution, display_resolution_list, iter )
{ {
RString s = ssprintf("%dx%d", iter->iWidth, iter->iHeight); RString s = ssprintf("%dx%d", iter->iWidth, iter->iHeight);
@@ -582,6 +585,7 @@ static void DisplayResolutionM( int &sel, bool ToSel, const ConfOption *pConfOpt
if(res_choices.empty()) if(res_choices.empty())
{ {
cache_display_resolution_list();
FOREACHS_CONST(DisplayResolution, display_resolution_list, iter) FOREACHS_CONST(DisplayResolution, display_resolution_list, iter)
{ {
res_choices.push_back(res_t(iter->iWidth, iter->iHeight)); res_choices.push_back(res_t(iter->iWidth, iter->iHeight));
@@ -706,7 +710,10 @@ static void InitializeConfOptions()
if( !g_ConfOptions.empty() ) if( !g_ConfOptions.empty() )
return; return;
cache_display_resolution_list(); // Clear the display_resolution_list so that we don't get problems from
// caching it. If the DisplayResolution option row is on the screen, it'll
// recache the list. -Kyz
display_resolution_list.clear();
// There are a couple ways of getting the current preference column or turning // There are a couple ways of getting the current preference column or turning
// a new choice in the interface into a new preference. The easiest is when // a new choice in the interface into a new preference. The easiest is when