d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add the correct parent to scaleCombo

Browse source
This commit is contained in:
Konstantinos Sideris 2018-10-07 12:58:38 +03:00
parent 4865f852d8
commit c2faaa4d39
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.md
View file

@ -2,6 +2,17 @@
## [Unreleased] ## [Unreleased]
## [0.6.2] - 2018-10-06
### Features
- Display tags as sorting items in the community panel (#401 @vberger)
- Add ability to configure the font size.
### Improvements
- Don't enable tray by default.
- Remove room re-ordering option.
- Hard-coded pixel values were removed. The sizes are derived from the font.
## [0.6.1] - 2018-09-26 ## [0.6.1] - 2018-09-26
### Improvements ### Improvements

19
src/UserSettingsPage.cpp
View file

@ -200,18 +200,14 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
auto scaleFactorOptionLayout = new QHBoxLayout; auto scaleFactorOptionLayout = new QHBoxLayout;
scaleFactorOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); scaleFactorOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto scaleFactorLabel = new QLabel(tr("Scale factor (requires restart)"), this); auto scaleFactorLabel = new QLabel(tr("Scale factor"), this);
scaleFactorLabel->setFont(font); scaleFactorLabel->setFont(font);
scaleFactorCombo_ = new QComboBox(this); scaleFactorCombo_ = new QComboBox(this);
scaleFactorCombo_->addItem("1"); for (double option = 1; option <= 3; option += 0.25)
scaleFactorCombo_->addItem("1.25"); scaleFactorCombo_->addItem(QString::number(option));
scaleFactorCombo_->addItem("1.5");
scaleFactorCombo_->addItem("1.75"); scaleFactorOptionLayout->addWidget(scaleFactorLabel);
scaleFactorCombo_->addItem("2"); scaleFactorOptionLayout->addWidget(scaleFactorCombo_, 0, Qt::AlignRight);
scaleFactorCombo_->addItem("2.25");
scaleFactorCombo_->addItem("2.5");
scaleFactorCombo_->addItem("2.75");
scaleFactorCombo_->addItem("3");
auto fontSizeOptionLayout = new QHBoxLayout; auto fontSizeOptionLayout = new QHBoxLayout;
fontSizeOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); fontSizeOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
@ -319,10 +315,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
scaleFactorLabel->hide(); scaleFactorLabel->hide();
scaleFactorCombo_->hide(); scaleFactorCombo_->hide();
#else
mainLayout_->addLayout(scaleFactorOptionLayout);
#endif #endif
mainLayout_->addLayout(scaleFactorOptionLayout);
mainLayout_->addLayout(fontSizeOptionLayout); mainLayout_->addLayout(fontSizeOptionLayout);
mainLayout_->addWidget(new HorizontalLine(this)); mainLayout_->addWidget(new HorizontalLine(this));
mainLayout_->addLayout(themeOptionLayout_); mainLayout_->addLayout(themeOptionLayout_);