Skip to content

Commit 1176bb5

Browse files
Double scaling factor (#1104)
* float scaling * float scaling factor * aooptions float * doublespinbox * header file double * double it up * clamp to 0.1
1 parent 5dea040 commit 1176bb5

5 files changed

Lines changed: 24 additions & 11 deletions

File tree

data/ui/options_dialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</widget>
103103
</item>
104104
<item row="4" column="1">
105-
<widget class="QSpinBox" name="theme_scaling_factor_sb">
105+
<widget class="QDoubleSpinBox" name="theme_scaling_factor_sb">
106106
<property name="minimum">
107107
<number>1</number>
108108
</property>

src/options.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@ void Options::setTheme(QString value)
9292
config.setValue("theme", value);
9393
}
9494

95-
int Options::themeScalingFactor() const
95+
double Options::themeScalingFactor() const
9696
{
97-
int value = config.value("theme_scaling_factor", "1").toInt();
98-
if (value <= 0)
97+
double value = config.value("theme_scaling_factor", "1").toDouble();
98+
if (value < 0.1)
9999
{
100-
value = 1;
100+
value = 0.1;
101101
}
102102
return value;
103103
}
104104

105-
void Options::setThemeScalingFactor(int value)
105+
void Options::setThemeScalingFactor(double value)
106106
{
107107
config.setValue("theme_scaling_factor", value);
108108
}

src/options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class Options
3030
QString theme() const;
3131
void setTheme(QString value);
3232

33-
int themeScalingFactor() const;
34-
void setThemeScalingFactor(int value);
33+
double themeScalingFactor() const;
34+
void setThemeScalingFactor(double value);
3535

3636
// Returns the blip rate from config.ini (once per X symbols)
3737
int blipRate() const;

src/widgets/aooptionsdialog.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <bass.h>
1111

1212
#include <QCollator>
13+
#include <QDoubleSpinBox>
1314
#include <QGroupBox>
1415
#include <QResource>
1516
#include <QUiLoader>
@@ -97,6 +98,18 @@ int AOOptionsDialog::widgetData(QSpinBox *widget) const
9798
return widget->value();
9899
}
99100

101+
template <>
102+
void AOOptionsDialog::setWidgetData(QDoubleSpinBox *widget, const double &value)
103+
{
104+
widget->setValue(value);
105+
}
106+
107+
template <>
108+
double AOOptionsDialog::widgetData(QDoubleSpinBox *widget) const
109+
{
110+
return widget->value();
111+
}
112+
100113
template <>
101114
void AOOptionsDialog::setWidgetData(QComboBox *widget, const QString &value)
102115
{
@@ -344,7 +357,7 @@ void AOOptionsDialog::setupUI()
344357
QDesktopServices::openUrl(QUrl::fromLocalFile(p_path));
345358
});
346359

347-
FROM_UI(QSpinBox, theme_scaling_factor_sb);
360+
FROM_UI(QDoubleSpinBox, theme_scaling_factor_sb);
348361
FROM_UI(QCheckBox, animated_theme_cb);
349362
FROM_UI(QSpinBox, stay_time_spinbox);
350363
FROM_UI(QCheckBox, instant_objection_cb);
@@ -374,7 +387,7 @@ void AOOptionsDialog::setupUI()
374387
FROM_UI(QCheckBox, restoreposition_cb);
375388
FROM_UI(QLineEdit, playerlist_format_edit);
376389

377-
registerOption<QSpinBox, int>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
390+
registerOption<QDoubleSpinBox, double>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
378391
registerOption<QCheckBox, bool>("animated_theme_cb", &Options::animatedThemeEnabled, &Options::setAnimatedThemeEnabled);
379392
registerOption<QSpinBox, int>("stay_time_spinbox", &Options::textStayTime, &Options::setTextStayTime);
380393
registerOption<QCheckBox, bool>("instant_objection_cb", &Options::objectionSkipQueueEnabled, &Options::setObjectionSkipQueueEnabled);

src/widgets/aooptionsdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class AOOptionsDialog : public QDialog
4343
QWidget *ui_settings_widget;
4444
QComboBox *ui_theme_combobox;
4545
QComboBox *ui_subtheme_combobox;
46-
QSpinBox *ui_theme_scaling_factor_sb;
46+
QDoubleSpinBox *ui_theme_scaling_factor_sb;
4747
QPushButton *ui_theme_reload_button;
4848
QPushButton *ui_theme_folder_button;
4949
QCheckBox *ui_evidence_double_click_cb;

0 commit comments

Comments
 (0)