summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2015-09-19 16:33:19 +0200
committerJules Blok <jules.blok@gmail.com>2015-12-13 22:58:38 +0100
commit3f7bf5ca93b4e1000f629feab26a38d5107bf66f (patch)
tree18076c890df3a797012301e31e918ed74d5fde51 /Source/Core
parentee657c04fed7d7f14331d7918b0afcfcb1ff858e (diff)
VideoConfigDiag: Snap the convergence slider.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/VideoConfigDiag.cpp4
-rw-r--r--Source/Core/DolphinWX/VideoConfigDiag.h8
2 files changed, 10 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp
index db3af0b841..f4c37a2b6a 100644
--- a/Source/Core/DolphinWX/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp
@@ -439,7 +439,9 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
szr_stereo->Add(new wxStaticText(page_enh, wxID_ANY, _("Depth:")), 1, wxALIGN_CENTER_VERTICAL, 0);
szr_stereo->Add(sep_slider, 0, wxEXPAND | wxRIGHT);
- wxSlider* const conv_slider = new wxSlider(page_enh, wxID_ANY, vconfig.iStereoConvergencePercentage, 0, 200, wxDefaultPosition, wxDefaultSize);
+ conv_slider = new wxSlider(page_enh, wxID_ANY, vconfig.iStereoConvergencePercentage, 0, 200, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS);
+ conv_slider->ClearTicks();
+ conv_slider->SetTick(100);
conv_slider->Bind(wxEVT_SLIDER, &VideoConfigDiag::Event_StereoConvergence, this);
RegisterControl(conv_slider, wxGetTranslation(stereo_convergence_desc));
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h
index b2581bd79b..89d5736b55 100644
--- a/Source/Core/DolphinWX/VideoConfigDiag.h
+++ b/Source/Core/DolphinWX/VideoConfigDiag.h
@@ -168,7 +168,12 @@ protected:
void Event_StereoConvergence(wxCommandEvent &ev)
{
- vconfig.iStereoConvergencePercentage = ev.GetInt();
+ // Snap the slider
+ int value = ev.GetInt();
+ if (90 < value && value < 110)
+ conv_slider->SetValue(100);
+
+ vconfig.iStereoConvergencePercentage = conv_slider->GetValue();
ev.Skip();
}
@@ -256,6 +261,7 @@ protected:
wxStaticText* text_aamode;
wxChoice* choice_aamode;
+ wxSlider* conv_slider;
wxStaticText* label_display_resolution;