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

fixed compile errors in VideoDialog

This commit is contained in:
thrust26 2018-01-23 11:17:59 +01:00
parent d115e3238e
commit d7dd6db9b8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/VideoDialog.cxx
View File

@ -55,7 +55,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
VariantList items; VariantList items;
// Set real dimensions // Set real dimensions
_w = std::min((52+4) * fontWidth + HBORDER * 2, max_w); _w = std::min((52+4*0) * fontWidth + HBORDER * 2, max_w);
_h = std::min((16-2) * (lineHeight + VGAP) + 14, max_h); _h = std::min((16-2) * (lineHeight + VGAP) + 14, max_h);
// The tab widget // The tab widget
@ -158,11 +158,11 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
wid.push_back(myFullscreen); wid.push_back(myFullscreen);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
pwidth = font.getStringWidth("0: 3840x2860@120Hz"); /*pwidth = font.getStringWidth("0: 3840x2860@120Hz");
myFullScreenMode = new PopUpWidget(myTab, font, xpos + INDENT + 2, ypos, pwidth, lineHeight, myFullScreenMode = new PopUpWidget(myTab, font, xpos + INDENT + 2, ypos, pwidth, lineHeight,
instance().frameBuffer().supportedScreenModes(), "Mode "); instance().frameBuffer().supportedScreenModes(), "Mode ");
wid.push_back(myFullScreenMode); wid.push_back(myFullScreenMode);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;*/
// FS stretch // FS stretch
myUseStretch = new CheckboxWidget(myTab, font, xpos, ypos, "Fullscreen Fill"); myUseStretch = new CheckboxWidget(myTab, font, xpos, ypos, "Fullscreen Fill");
@ -359,8 +359,8 @@ void VideoDialog::loadConfig()
// Fullscreen // Fullscreen
myFullscreen->setState(instance().settings().getBool("fullscreen")); myFullscreen->setState(instance().settings().getBool("fullscreen"));
string mode = instance().settings().getString("fullscreenmode"); /*string mode = instance().settings().getString("fullscreenmode");
myFullScreenMode->setSelected(mode); myFullScreenMode->setSelected(mode);*/
// Fullscreen stretch setting // Fullscreen stretch setting
myUseStretch->setState(instance().settings().getBool("tia.fsfill")); myUseStretch->setState(instance().settings().getBool("tia.fsfill"));
@ -445,8 +445,8 @@ void VideoDialog::saveConfig()
// Fullscreen // Fullscreen
instance().settings().setValue("fullscreen", myFullscreen->getState()); instance().settings().setValue("fullscreen", myFullscreen->getState());
instance().settings().setValue("fullscreenmode", /*instance().settings().setValue("fullscreenmode",
myFullScreenMode->getSelectedTag().toString()); myFullScreenMode->getSelectedTag().toString());*/
// Fullscreen stretch setting // Fullscreen stretch setting
instance().settings().setValue("tia.fsfill", myUseStretch->getState()); instance().settings().setValue("tia.fsfill", myUseStretch->getState());
@ -521,7 +521,7 @@ void VideoDialog::setDefaults()
myFrameRateLabel->setLabel("Auto"); myFrameRateLabel->setLabel("Auto");
myFullscreen->setState(false); myFullscreen->setState(false);
myFullScreenMode->setSelectedIndex(0); //myFullScreenMode->setSelectedIndex(0);
myUseStretch->setState(true); myUseStretch->setState(true);
myUseVSync->setState(true); myUseVSync->setState(true);
myUIMessages->setState(true); myUIMessages->setState(true);

2
src/gui/VideoDialog.hxx
View File

@ -64,7 +64,7 @@ class VideoDialog : public Dialog
SliderWidget* myFrameRate; SliderWidget* myFrameRate;
StaticTextWidget* myFrameRateLabel; StaticTextWidget* myFrameRateLabel;
CheckboxWidget* myFullscreen; CheckboxWidget* myFullscreen;
PopUpWidget* myFullScreenMode; //PopUpWidget* myFullScreenMode;
CheckboxWidget* myUseStretch; CheckboxWidget* myUseStretch;
CheckboxWidget* myUseVSync; CheckboxWidget* myUseVSync;
CheckboxWidget* myUIMessages; CheckboxWidget* myUIMessages;