mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

improved resolution change in options menu

Browse Source
This commit is contained in:
Titus Tscharntke
2010-04-02 14:21:43 +00:00
parent 8cf77f1b8a
commit 198d2aeb98
3 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
source/glest_game/menu/menu_state_options.cpp
View File

@@ -46,7 +46,9 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
int buttonRowPos=80; int buttonRowPos=80;
int captionOffset=75; int captionOffset=75;
mainMessageBox.init(lang.get("Ok"));
mainMessageBox.setEnabled(false);
mainMessageBoxState=0;
labelAudioSection.init(leftLabelStart+captionOffset, leftline); labelAudioSection.init(leftLabelStart+captionOffset, leftline);
labelAudioSection.setFont(CoreData::getInstance().getMenuFontVeryBig()); labelAudioSection.setFont(CoreData::getInstance().getMenuFontVeryBig());
@@ -119,7 +121,8 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
for(list<ModeInfo>::const_iterator it= modeInfos.begin(); it!=modeInfos.end(); ++it){ for(list<ModeInfo>::const_iterator it= modeInfos.begin(); it!=modeInfos.end(); ++it){
listBoxScreenModes.pushBackItem((*it).getString()); listBoxScreenModes.pushBackItem((*it).getString());
} }
listBoxScreenModes.setSelectedItem(config.getString("ScreenWidth")+"x"+config.getString("ScreenHeight")); listBoxScreenModes.setSelectedItem(config.getString("ScreenWidth")+"x"+
config.getString("ScreenHeight")+"-"+intToStr(config.getInt("ColorBits")));
leftline-=30; leftline-=30;
//filter //filter
@@ -180,14 +183,58 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
} }
void MenuStateOptions::showMessageBox(const string &text, const string &header, bool toggle){
if(!toggle){
mainMessageBox.setEnabled(false);
}
if(!mainMessageBox.getEnabled()){
mainMessageBox.setText(text);
mainMessageBox.setHeader(header);
mainMessageBox.setEnabled(true);
}
else{
mainMessageBox.setEnabled(false);
}
}
void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
Config &config= Config::getInstance(); Config &config= Config::getInstance();
CoreData &coreData= CoreData::getInstance(); CoreData &coreData= CoreData::getInstance();
SoundRenderer &soundRenderer= SoundRenderer::getInstance(); SoundRenderer &soundRenderer= SoundRenderer::getInstance();
if(buttonOk.mouseClick(x, y)){ if(mainMessageBox.getEnabled()){
int button= 1;
if(mainMessageBox.mouseClick(x, y, button))
{
soundRenderer.playFx(coreData.getClickSoundA()); soundRenderer.playFx(coreData.getClickSoundA());
if(button==1)
{
if(mainMessageBoxState==1)
{
mainMessageBox.setEnabled(false);
saveConfig();
mainMenu->setState(new MenuStateRoot(program, mainMenu));
}
else
mainMessageBox.setEnabled(false);
}
}
}
else if(buttonOk.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundA());
string currentResolution=config.getString("ScreenWidth")+"x"+config.getString("ScreenHeight")+"-"+intToStr(config.getInt("ColorBits"));
string selectedResolution=listBoxScreenModes.getSelectedItem();
if(currentResolution!=selectedResolution){
mainMessageBoxState=1;
Lang &lang= Lang::getInstance();
showMessageBox(lang.get("RestartNeeded"), lang.get("ResolutionChanged"), false);
return;
}
saveConfig(); saveConfig();
mainMenu->setState(new MenuStateRoot(program, mainMenu)); mainMenu->setState(new MenuStateRoot(program, mainMenu));
} }
@@ -220,6 +267,9 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
} }
void MenuStateOptions::mouseMove(int x, int y, const MouseState *ms){ void MenuStateOptions::mouseMove(int x, int y, const MouseState *ms){
if (mainMessageBox.getEnabled()) {
mainMessageBox.mouseMove(x, y);
}
buttonOk.mouseMove(x, y); buttonOk.mouseMove(x, y);
buttonAbort.mouseMove(x, y); buttonAbort.mouseMove(x, y);
buttonAutoConfig.mouseMove(x, y); buttonAutoConfig.mouseMove(x, y);
@@ -269,6 +319,11 @@ void MenuStateOptions::keyPress(char c){
void MenuStateOptions::render(){ void MenuStateOptions::render(){
Renderer &renderer= Renderer::getInstance(); Renderer &renderer= Renderer::getInstance();
if(mainMessageBox.getEnabled()){
renderer.renderMessageBox(&mainMessageBox);
}
else
{
renderer.renderButton(&buttonOk); renderer.renderButton(&buttonOk);
renderer.renderButton(&buttonAbort); renderer.renderButton(&buttonAbort);
renderer.renderButton(&buttonAutoConfig); renderer.renderButton(&buttonAutoConfig);
@@ -298,6 +353,7 @@ void MenuStateOptions::render(){
renderer.renderLabel(&labelScreenModes); renderer.renderLabel(&labelScreenModes);
renderer.renderListBox(&listBoxScreenModes); renderer.renderListBox(&listBoxScreenModes);
} }
}
void MenuStateOptions::saveConfig(){ void MenuStateOptions::saveConfig(){
Config &config= Config::getInstance(); Config &config= Config::getInstance();
@@ -333,6 +389,7 @@ void MenuStateOptions::saveConfig(){
{ {
config.setInt("ScreenWidth",(*it).width); config.setInt("ScreenWidth",(*it).width);
config.setInt("ScreenHeight",(*it).height); config.setInt("ScreenHeight",(*it).height);
config.setInt("ColorBits",(*it).depth);
} }
} }
} }

4
source/glest_game/menu/menu_state_options.h
View File

@@ -56,6 +56,9 @@ private:
GraphicLabel labelAudioSection; GraphicLabel labelAudioSection;
GraphicLabel labelMiscSection; GraphicLabel labelMiscSection;
GraphicMessageBox mainMessageBox;
int mainMessageBoxState;
public: public:
MenuStateOptions(Program *program, MainMenu *mainMenu); MenuStateOptions(Program *program, MainMenu *mainMenu);
@@ -70,6 +73,7 @@ public:
private: private:
void saveConfig(); void saveConfig();
void setActiveInputLable(GraphicLabel* newLable); void setActiveInputLable(GraphicLabel* newLable);
void showMessageBox(const string &text, const string &header, bool toggle);
}; };
}}//end namespace }}//end namespace

21
source/shared_lib/sources/platform/sdl/platform_util.cpp
View File

@@ -576,7 +576,7 @@ void getFullscreenVideoModes(list<ModeInfo> *modeinfos) {
uniqueResList[lookupKey] = true; uniqueResList[lookupKey] = true;
modeinfos->push_back(ModeInfo(vidInfo->current_w,vidInfo->current_h,vidInfo->vfmt->BitsPerPixel)); modeinfos->push_back(ModeInfo(vidInfo->current_w,vidInfo->current_h,vidInfo->vfmt->BitsPerPixel));
} }
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding only current resolution: %d x %d.\n",__FILE__,__FUNCTION__,__LINE__,vidInfo->current_w,vidInfo->current_h); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding only current resolution: %d x %d - %d.\n",__FILE__,__FUNCTION__,__LINE__,vidInfo->current_w,vidInfo->current_h,vidInfo->vfmt->BitsPerPixel);
} }
/* Check if our resolution is restricted */ /* Check if our resolution is restricted */
else if (modes == (SDL_Rect**)-1) { else if (modes == (SDL_Rect**)-1) {
@@ -588,7 +588,7 @@ void getFullscreenVideoModes(list<ModeInfo> *modeinfos) {
uniqueResList[lookupKey] = true; uniqueResList[lookupKey] = true;
modeinfos->push_back(ModeInfo(vidInfo->current_w,vidInfo->current_h,vidInfo->vfmt->BitsPerPixel)); modeinfos->push_back(ModeInfo(vidInfo->current_w,vidInfo->current_h,vidInfo->vfmt->BitsPerPixel));
} }
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding only current resolution: %d x %d.\n",__FILE__,__FUNCTION__,__LINE__,vidInfo->current_w,vidInfo->current_h); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding only current resolution: %d x %d - %d.\n",__FILE__,__FUNCTION__,__LINE__,vidInfo->current_w,vidInfo->current_h,vidInfo->vfmt->BitsPerPixel);
} }
else{ else{
/* Print valid modes */ /* Print valid modes */
@@ -597,12 +597,19 @@ void getFullscreenVideoModes(list<ModeInfo> *modeinfos) {
int bestW = -1; int bestW = -1;
int bestH = -1; int bestH = -1;
for(int i=0; modes[i]; ++i) { for(int i=0; modes[i]; ++i) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"%d x %d\n",modes[i]->w, modes[i]->h,modes[i]->x); SystemFlags::OutputDebug(SystemFlags::debugSystem,"%d x %d\n",modes[i]->w, modes[i]->h,bpp);
string lookupKey = intToStr(modes[i]->w) + "_" + intToStr(modes[i]->h) + "_" + intToStr(modes[i]->x); string lookupKey = intToStr(modes[i]->w) + "_" + intToStr(modes[i]->h) + "_" + intToStr(bpp);
if(uniqueResList.find(lookupKey) == uniqueResList.end()) { if(uniqueResList.find(lookupKey) == uniqueResList.end()) {
uniqueResList[lookupKey] = true; uniqueResList[lookupKey] = true;
modeinfos->push_back(ModeInfo(modes[i]->w,modes[i]->h,modes[i]->x)); modeinfos->push_back(ModeInfo(modes[i]->w,modes[i]->h,bpp));
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding resolution: %d x %d.\n",__FILE__,__FUNCTION__,__LINE__,modes[i]->w,modes[i]->h); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding resolution: %d x %d - %d.\n",__FILE__,__FUNCTION__,__LINE__,modes[i]->w,modes[i]->h,bpp);
}
// fake the missing 16 bit resolutions in linux
string lookupKey16 = intToStr(modes[i]->w) + "_" + intToStr(modes[i]->h) + "_" + intToStr(16);
if(uniqueResList.find(lookupKey16) == uniqueResList.end()) {
uniqueResList[lookupKey16] = true;
modeinfos->push_back(ModeInfo(modes[i]->w,modes[i]->h,16));
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] adding resolution: %d x %d - %d.\n",__FILE__,__FUNCTION__,__LINE__,modes[i]->w,modes[i]->h,16);
} }
} }
} }
@@ -706,7 +713,7 @@ ModeInfo::ModeInfo(int w, int h, int d) {
} }
string ModeInfo::getString() const{ string ModeInfo::getString() const{
return intToStr(width)+"x"+intToStr(height); return intToStr(width)+"x"+intToStr(height)+"-"+intToStr(depth);
} }
}}//end namespace }}//end namespace