Merge branch 'master' into webcache

Author: OmniTroid

data/ui/options_dialog.ui

@@ -102,7 +102,7 @@
             </widget>
            </item>
            <item row="4" column="1">
-            <widget class="QSpinBox" name="theme_scaling_factor_sb">
+            <widget class="QDoubleSpinBox" name="theme_scaling_factor_sb">
              <property name="minimum">
               <number>1</number>
              </property>

src/options.cpp

@@ -92,17 +92,17 @@ void Options::setTheme(QString value)
   config.setValue("theme", value);
 }
 
-int Options::themeScalingFactor() const
+double Options::themeScalingFactor() const
 {
-  int value = config.value("theme_scaling_factor", "1").toInt();
-  if (value <= 0)
+  double value = config.value("theme_scaling_factor", "1").toDouble();
+  if (value < 0.1)
   {
-    value = 1;
+    value = 0.1;
   }
   return value;
 }
 
-void Options::setThemeScalingFactor(int value)
+void Options::setThemeScalingFactor(double value)
 {
   config.setValue("theme_scaling_factor", value);
 }

src/options.h

@@ -30,8 +30,8 @@ class Options
   QString theme() const;
   void setTheme(QString value);
 
-  int themeScalingFactor() const;
-  void setThemeScalingFactor(int value);
+  double themeScalingFactor() const;
+  void setThemeScalingFactor(double value);
 
   // Returns the blip rate from config.ini (once per X symbols)
   int blipRate() const;

src/widgets/aooptionsdialog.cpp

@@ -11,6 +11,7 @@
 #include <bass.h>
 
 #include <QCollator>
+#include <QDoubleSpinBox>
 #include <QGroupBox>
 #include <QResource>
 #include <QUiLoader>
@@ -98,6 +99,18 @@ int AOOptionsDialog::widgetData(QSpinBox *widget) const
   return widget->value();
 }
 
+template <>
+void AOOptionsDialog::setWidgetData(QDoubleSpinBox *widget, const double &value)
+{
+  widget->setValue(value);
+}
+
+template <>
+double AOOptionsDialog::widgetData(QDoubleSpinBox *widget) const
+{
+  return widget->value();
+}
+
 template <>
 void AOOptionsDialog::setWidgetData(QComboBox *widget, const QString &value)
 {
@@ -345,7 +358,7 @@ void AOOptionsDialog::setupUI()
     QDesktopServices::openUrl(QUrl::fromLocalFile(p_path));
   });
 
-  FROM_UI(QSpinBox, theme_scaling_factor_sb);
+  FROM_UI(QDoubleSpinBox, theme_scaling_factor_sb);
   FROM_UI(QCheckBox, animated_theme_cb);
   FROM_UI(QSpinBox, stay_time_spinbox);
   FROM_UI(QCheckBox, instant_objection_cb);
@@ -375,7 +388,7 @@ void AOOptionsDialog::setupUI()
   FROM_UI(QCheckBox, restoreposition_cb);
   FROM_UI(QLineEdit, playerlist_format_edit);
 
-  registerOption<QSpinBox, int>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
+  registerOption<QDoubleSpinBox, double>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
   registerOption<QCheckBox, bool>("animated_theme_cb", &Options::animatedThemeEnabled, &Options::setAnimatedThemeEnabled);
   registerOption<QSpinBox, int>("stay_time_spinbox", &Options::textStayTime, &Options::setTextStayTime);
   registerOption<QCheckBox, bool>("instant_objection_cb", &Options::objectionSkipQueueEnabled, &Options::setObjectionSkipQueueEnabled);

src/widgets/aooptionsdialog.h

@@ -43,7 +43,7 @@ class AOOptionsDialog : public QDialog
   QWidget *ui_settings_widget;
   QComboBox *ui_theme_combobox;
   QComboBox *ui_subtheme_combobox;
-  QSpinBox *ui_theme_scaling_factor_sb;
+  QDoubleSpinBox *ui_theme_scaling_factor_sb;
   QPushButton *ui_theme_reload_button;
   QPushButton *ui_theme_folder_button;
   QCheckBox *ui_evidence_double_click_cb;