diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-11-30 22:59:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-11-30 22:59:30 +0300 |
commit | 54a54eb5317650fc3306d200517bcc48bb7f1d9c (patch) | |
tree | c9531ffffa2b8a97c134a0d7d0ad14de16da3dc9 /src/gui/widgets | |
parent | 679f626e7e937a55b315d58fd3c3e23077e91ede (diff) | |
download | mv-54a54eb5317650fc3306d200517bcc48bb7f1d9c.tar.gz mv-54a54eb5317650fc3306d200517bcc48bb7f1d9c.tar.bz2 mv-54a54eb5317650fc3306d200517bcc48bb7f1d9c.tar.xz mv-54a54eb5317650fc3306d200517bcc48bb7f1d9c.zip |
fix styled drawing after update.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/setupitem.cpp | 8 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_colors.cpp | 16 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_video.cpp | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 043d0870f..9b552d568 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -696,7 +696,7 @@ void SetupItemSlider::createControls() mSlider = new Slider(mMin, mMax); mSlider->setActionEventId(mEventName); mSlider->addActionListener(mParent); - mSlider->setValue(atof(mValue.c_str())); + mSlider->setValue2(atof(mValue.c_str())); mSlider->setHeight(30); mWidget = mSlider; @@ -725,7 +725,7 @@ void SetupItemSlider::toWidget() if (!mSlider) return; - mSlider->setValue(atof(mValue.c_str())); + mSlider->setValue2(atof(mValue.c_str())); } void SetupItemSlider::action(const gcn::ActionEvent &event A_UNUSED) @@ -820,7 +820,7 @@ void SetupItemSlider2::createControls() mSlider = new Slider(mMin, mMax); mSlider->setActionEventId(mEventName); mSlider->addActionListener(mParent); - mSlider->setValue(atof(mValue.c_str())); + mSlider->setValue2(atof(mValue.c_str())); mSlider->setHeight(30); mWidget = mSlider; @@ -879,7 +879,7 @@ void SetupItemSlider2::toWidget() int val = roundDouble(atof(mValue.c_str())); if (mInvert) val = mInvertValue - val; - mSlider->setValue(val); + mSlider->setValue2(val); updateLabel(); } diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index 9b7036222..2629d084d 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -94,7 +94,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mGradTypeSlider->setWidth(180); mGradTypeSlider->setActionEventId("slider_grad"); - mGradTypeSlider->setValue(0); + mGradTypeSlider->setValue2(0); mGradTypeSlider->addActionListener(this); mGradTypeSlider->setEnabled(false); @@ -126,7 +126,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mGradDelayText->setEnabled(false); mGradDelaySlider->setWidth(180); - mGradDelaySlider->setValue(mGradDelayText->getValue()); + mGradDelaySlider->setValue2(mGradDelayText->getValue()); mGradDelaySlider->setActionEventId("slider_graddelay"); mGradDelaySlider->addActionListener(this); mGradDelaySlider->setEnabled(false); @@ -137,7 +137,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mRedText->setEnabled(false); mRedSlider->setWidth(180); - mRedSlider->setValue(mRedText->getValue()); + mRedSlider->setValue2(mRedText->getValue()); mRedSlider->setActionEventId("slider_red"); mRedSlider->addActionListener(this); mRedSlider->setEnabled(false); @@ -148,7 +148,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mGreenText->setEnabled(false); mGreenSlider->setWidth(180); - mGreenSlider->setValue(mGreenText->getValue()); + mGreenSlider->setValue2(mGreenText->getValue()); mGreenSlider->setActionEventId("slider_green"); mGreenSlider->addActionListener(this); mGreenSlider->setEnabled(false); @@ -159,7 +159,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mBlueText->setEnabled(false); mBlueSlider->setWidth(180); - mBlueSlider->setValue(mBlueText->getValue()); + mBlueSlider->setValue2(mBlueText->getValue()); mBlueSlider->setActionEventId("slider_blue"); mBlueSlider->addActionListener(this); mBlueSlider->setEnabled(false); @@ -354,7 +354,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED) setEntry(mGreenSlider, mGreenText, col->g); setEntry(mBlueSlider, mBlueText, col->b); - mGradTypeSlider->setValue(grad); + mGradTypeSlider->setValue2(grad); updateGradType(); mGradTypeSlider->setEnabled(true); } @@ -363,7 +363,7 @@ void Setup_Colors::setEntry(Slider *const s, TextField *const t, const int value) { if (s) - s->setValue(value); + s->setValue2(value); if (t) t->setText(toString(value)); } @@ -382,7 +382,7 @@ void Setup_Colors::cancel() userPalette->rollback(); const int type = userPalette->getColorTypeAt(mSelected); const gcn::Color *const col = &userPalette->getColor(type); - mGradTypeSlider->setValue(userPalette->getGradientType(type)); + mGradTypeSlider->setValue2(userPalette->getGradientType(type)); const int delay = userPalette->getGradientDelay(type); setEntry(mGradDelaySlider, mGradDelayText, delay); setEntry(mRedSlider, mRedText, col->r); diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 2eb0e4ef0..d6532fb86 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -236,10 +236,10 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : mAltFpsLabel->setCaption(_("Alt FPS limit: ") + (mAltFps > 0 ? toString(mAltFps) : _("None"))); mAltFpsLabel->setWidth(150); - mFpsSlider->setValue(mFps); mFpsSlider->setEnabled(mFps > 0); - mAltFpsSlider->setValue(mAltFps); + mFpsSlider->setValue2(mFps); mAltFpsSlider->setEnabled(mAltFps > 0); + mAltFpsSlider->setValue2(mAltFps); mFpsCheckBox->setSelected(mFps > 0); // Pre-select the current video mode. @@ -413,10 +413,10 @@ void Setup_Video::cancel() mFsCheckBox->setSelected(mFullScreenEnabled); mOpenGLDropDown->setSelected(renderToIndex[mOpenGLEnabled]); mCustomCursorCheckBox->setSelected(mCustomCursorEnabled); - mFpsSlider->setValue(mFps); mFpsSlider->setEnabled(mFps > 0); - mAltFpsSlider->setValue(mAltFps); + mFpsSlider->setValue2(mFps); mAltFpsSlider->setEnabled(mAltFps > 0); + mAltFpsSlider->setValue2(mAltFps); mFpsLabel->setCaption(mFpsCheckBox->isSelected() // TRANSLATORS: video settings label ? toString(mFps) : _("None")); @@ -535,8 +535,8 @@ void Setup_Video::action(const gcn::ActionEvent &event) const std::string text = mFps > 0 ? toString(mFps) : _("None"); mFpsLabel->setCaption(text); - mFpsSlider->setValue(mFps); mFpsSlider->setEnabled(mFps > 0); + mFpsSlider->setValue2(mFps); } else if (id == "altfpslimitslider") { @@ -549,8 +549,8 @@ void Setup_Video::action(const gcn::ActionEvent &event) // TRANSLATORS: video settings label mAltFpsLabel->setCaption(_("Alt FPS limit: ") + text); - mAltFpsSlider->setValue(mAltFps); mAltFpsSlider->setEnabled(mAltFps > 0); + mAltFpsSlider->setValue2(mAltFps); } else if (id == "enableresize") { |