From 397cb31dadc798d8c73c4e7b9b63d860a94c18a0 Mon Sep 17 00:00:00 2001 From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com> Date: Tue, 22 Jul 2025 08:43:13 +0200 Subject: [PATCH] tweaks to sliders --- src/data/field/slider.cpp | 17 ++--------------- src/gui/about_window.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/data/field/slider.cpp b/src/data/field/slider.cpp index 7a03638a..47b3001e 100644 --- a/src/data/field/slider.cpp +++ b/src/data/field/slider.cpp @@ -37,11 +37,7 @@ void SliderField::after_reading(Version ver) { int choice_count = choices->choices.size(); - if (maximum < minimum) { - int temp = maximum; - maximum = minimum; - minimum = temp; - } + if (maximum < minimum) swap(minimum, maximum); if (increment < 1) increment = 1; for (int i = minimum; i < maximum; i += increment) { @@ -49,16 +45,7 @@ void SliderField::after_reading(Version ver) { } choices->choices.push_back(make_intrusive(wxString::Format(wxT("%i"), maximum))); - int initial_int; - try { - initial_int = std::stoi(initial.ToStdString()); - if (initial_int < minimum || initial_int > maximum) initial = wxString::Format(wxT("%i"), minimum); - } - catch (...) { - initial = wxString::Format(wxT("%i"), minimum); - } - - // Move individual choices that are greater than maximum to the end + // Move individual choices that are numbers greater than maximum to the end for (int i = 0; i < choice_count; ++i) { try { int choice_int = std::stoi(choices->choices[i].get()->name.ToStdString()); diff --git a/src/gui/about_window.cpp b/src/gui/about_window.cpp index ee75fb9b..3c39053f 100644 --- a/src/gui/about_window.cpp +++ b/src/gui/about_window.cpp @@ -33,7 +33,15 @@ void AboutWindow::onPaint(wxPaintEvent& ev) { draw(dc); } -const char* MSE_AUTHORS[] = {"Twan van Laarhoven (twanvl)", "Sean Hunt (coppro)", "Alissa Rao (Lymia)", "haganbmj", "CaiCai (247321453)", "Olivier Bocksberger (GenevensiS)" }; +const char* MSE_AUTHORS[] = { + "Twan van Laarhoven (twanvl)", + "Sean Hunt (coppro)", + "Alissa Rao (Lymia)", + "Brendan Hagan (haganbmj)", + "CaiCai (247321453)", + "Olivier Bocksberger (G-e-n-e-v-e-n-s-i-S)", + "Thomas Tkacz (TomTkacz)" +}; void AboutWindow::draw(DC& dc) { wxSize ws = GetClientSize();