From d7dd6db9b8b92de13e952427aad9fe46a94e8f61 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Tue, 23 Jan 2018 11:17:59 +0100 Subject: [PATCH] fixed compile errors in VideoDialog --- src/gui/VideoDialog.cxx | 16 ++++++++-------- src/gui/VideoDialog.hxx | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx index b45e3ec51..78751d165 100644 --- a/src/gui/VideoDialog.cxx +++ b/src/gui/VideoDialog.cxx @@ -55,7 +55,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, VariantList items; // 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); // The tab widget @@ -158,11 +158,11 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, wid.push_back(myFullscreen); 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, instance().frameBuffer().supportedScreenModes(), "Mode "); wid.push_back(myFullScreenMode); - ypos += lineHeight + VGAP; + ypos += lineHeight + VGAP;*/ // FS stretch myUseStretch = new CheckboxWidget(myTab, font, xpos, ypos, "Fullscreen Fill"); @@ -359,8 +359,8 @@ void VideoDialog::loadConfig() // Fullscreen myFullscreen->setState(instance().settings().getBool("fullscreen")); - string mode = instance().settings().getString("fullscreenmode"); - myFullScreenMode->setSelected(mode); + /*string mode = instance().settings().getString("fullscreenmode"); + myFullScreenMode->setSelected(mode);*/ // Fullscreen stretch setting myUseStretch->setState(instance().settings().getBool("tia.fsfill")); @@ -445,8 +445,8 @@ void VideoDialog::saveConfig() // Fullscreen instance().settings().setValue("fullscreen", myFullscreen->getState()); - instance().settings().setValue("fullscreenmode", - myFullScreenMode->getSelectedTag().toString()); + /*instance().settings().setValue("fullscreenmode", + myFullScreenMode->getSelectedTag().toString());*/ // Fullscreen stretch setting instance().settings().setValue("tia.fsfill", myUseStretch->getState()); @@ -521,7 +521,7 @@ void VideoDialog::setDefaults() myFrameRateLabel->setLabel("Auto"); myFullscreen->setState(false); - myFullScreenMode->setSelectedIndex(0); + //myFullScreenMode->setSelectedIndex(0); myUseStretch->setState(true); myUseVSync->setState(true); myUIMessages->setState(true); diff --git a/src/gui/VideoDialog.hxx b/src/gui/VideoDialog.hxx index bf09fced3..f508d60f8 100644 --- a/src/gui/VideoDialog.hxx +++ b/src/gui/VideoDialog.hxx @@ -64,7 +64,7 @@ class VideoDialog : public Dialog SliderWidget* myFrameRate; StaticTextWidget* myFrameRateLabel; CheckboxWidget* myFullscreen; - PopUpWidget* myFullScreenMode; + //PopUpWidget* myFullScreenMode; CheckboxWidget* myUseStretch; CheckboxWidget* myUseVSync; CheckboxWidget* myUIMessages;