moved more stuff into appbase

src/widgets/Window.cpp

@@ -9,6 +9,7 @@
 #include "singletons/Updates.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/InitUpdateButton.hpp"
+#include "util/Shortcut.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
@@ -16,7 +17,6 @@
 #include "widgets/dialogs/WelcomeDialog.hpp"
 #include "widgets/helper/EffectLabel.hpp"
 #include "widgets/helper/NotebookTab.hpp"
-#include "util/Shortcut.hpp"
 #include "widgets/helper/TitlebarButton.hpp"
 #include "widgets/splits/ClosedSplits.hpp"
 #include "widgets/splits/Split.hpp"
@@ -289,8 +289,8 @@ void Window::addShortcuts()
         auto s = new QShortcut(QKeySequence::ZoomIn, this);
         s->setContext(Qt::WindowShortcut);
         QObject::connect(s, &QShortcut::activated, this, [] {
-            getSettings()->uiScale.setValue(WindowManager::clampUiScale(
-                getSettings()->uiScale.getValue() + 1));
+            getSettings()->setClampedUiScale(
+                getSettings()->getClampedUiScale() + 0.1f);
         });
     }
 
@@ -299,8 +299,8 @@ void Window::addShortcuts()
         auto s = new QShortcut(QKeySequence::ZoomOut, this);
         s->setContext(Qt::WindowShortcut);
         QObject::connect(s, &QShortcut::activated, this, [] {
-            getSettings()->uiScale.setValue(WindowManager::clampUiScale(
-                getSettings()->uiScale.getValue() - 1));
+            getSettings()->setClampedUiScale(
+                getSettings()->getClampedUiScale() - 0.1f);
         });
     }
 

src/widgets/helper/EffectLabel.cpp

@@ -1,45 +0,0 @@
-#include "widgets/helper/EffectLabel.hpp"
-#include "singletons/Theme.hpp"
-#include "widgets/splits/SplitHeader.hpp"
-
-#include <QBrush>
-#include <QPainter>
-
-namespace chatterino {
-
-EffectLabel::EffectLabel(BaseWidget *parent, int spacing)
-    : Button(parent)
-    , label_(this)
-{
-    setLayout(&this->hbox_);
-
-    this->label_.setAlignment(Qt::AlignCenter);
-
-    this->hbox_.setMargin(0);
-    this->hbox_.addSpacing(spacing);
-    this->hbox_.addWidget(&this->label_);
-    this->hbox_.addSpacing(spacing);
-}
-
-EffectLabel2::EffectLabel2(BaseWidget *parent, int padding)
-    : Button(parent)
-    , label_(this)
-{
-    auto *hbox = new QHBoxLayout(this);
-    this->setLayout(hbox);
-
-    //    this->label_.setAlignment(Qt::AlignCenter);
-    this->label_.setCentered(true);
-
-    hbox->setMargin(0);
-    //    hbox.addSpacing(spacing);
-    hbox->addWidget(&this->label_);
-    //    hbox.addSpacing(spacing);
-}
-
-Label &EffectLabel2::getLabel()
-{
-    return this->label_;
-}
-
-}  // namespace chatterino

src/widgets/helper/EffectLabel.hpp

@@ -1,41 +0,0 @@
-#pragma once
-
-#include "widgets/BaseWidget.hpp"
-#include "widgets/Label.hpp"
-#include "widgets/helper/Button.hpp"
-#include "widgets/helper/SignalLabel.hpp"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPaintEvent>
-#include <QWidget>
-
-namespace chatterino {
-
-class EffectLabel : public Button
-{
-public:
-    explicit EffectLabel(BaseWidget *parent = nullptr, int spacing = 6);
-
-    SignalLabel &getLabel()
-    {
-        return this->label_;
-    }
-
-private:
-    QHBoxLayout hbox_;
-    SignalLabel label_;
-};
-
-class EffectLabel2 : public Button
-{
-public:
-    explicit EffectLabel2(BaseWidget *parent = nullptr, int padding = 6);
-
-    Label &getLabel();
-
-private:
-    Label label_;
-};
-
-}  // namespace chatterino

src/widgets/helper/NotebookTab.cpp

@@ -100,7 +100,14 @@ void NotebookTab::updateSize()
         width = (metrics.width(this->getTitle()) + int(16 * scale));
     }
 
-    width = clamp(width, this->height(), int(150 * scale));
+    if (this->height() > 150 * scale)
+    {
+        width = this->height();
+    }
+    else
+    {
+        width = clamp(width, this->height(), int(150 * scale));
+    }
     auto height = int(NOTEBOOK_TAB_HEIGHT * scale);
 
     if (this->width() != width || this->height() != height)

src/widgets/settingspages/GeneralPage.cpp

@@ -158,12 +158,18 @@ void GeneralPage::initLayout(SettingsLayout &layout)
         getApp()->fonts->chatFontSize,
         [](auto val) { return QString::number(val) + "pt"; },
         [](auto args) { return fuzzyToInt(args.value, 10); });
-    layout.addDropdown<int>(
+    layout.addDropdown<float>(
         "UI Scale",
         {"0.5x", "0.6x", "0.7x", "0.8x", "0.9x", "Default", "1.2x", "1.4x",
          "1.6x", "1.8x", "2x", "2.33x", "2.66x", "3x", "3.5x", "4x"},
-        s.uiScale, [](auto val) { return val + 5; },
-        [](auto args) { return args.index - 5; }, false);
+        s.uiScale,
+        [](auto val) {
+            if (val == 1)
+                return QString("Default");
+            else
+                return QString::number(val) + "x";
+        },
+        [](auto args) { return fuzzyToFloat(args.value, 1.f); });
     layout.addCheckbox("Always on top", s.windowTopMost);
 
     layout.addTitle("Interface");

src/widgets/settingspages/LookPage.cpp

@@ -125,13 +125,6 @@ void LookPage::addInterfaceTab(LayoutCreator<QVBoxLayout> layout)
         box->addStretch(1);
     }
 
-    // ui scale
-    {
-        auto box = layout.emplace<QHBoxLayout>().withoutMargin();
-        box.emplace<QLabel>("Window scale: ");
-        box.append(this->createUiScaleSlider());
-    }
-
     layout.append(
         this->createCheckBox(WINDOW_TOPMOST, getSettings()->windowTopMost));
 
@@ -567,34 +560,6 @@ QLayout *LookPage::createFontChanger()
     return layout;
 }
 
-QLayout *LookPage::createUiScaleSlider()
-{
-    auto layout = new QHBoxLayout();
-    auto slider = new QSlider(Qt::Horizontal);
-    auto label = new QLabel();
-    layout->addWidget(slider);
-    layout->addWidget(label);
-
-    slider->setMinimum(WindowManager::uiScaleMin);
-    slider->setMaximum(WindowManager::uiScaleMax);
-    slider->setValue(
-        WindowManager::clampUiScale(getSettings()->uiScale.getValue()));
-
-    label->setMinimumWidth(100);
-
-    QObject::connect(slider, &QSlider::valueChanged, [](auto value) {
-        getSettings()->uiScale.setValue(value);
-    });
-
-    getSettings()->uiScale.connect(
-        [label](auto, auto) {
-            label->setText(QString::number(WindowManager::getUiScaleValue()));
-        },
-        this->connections_);
-
-    return layout;
-}
-
 QLayout *LookPage::createBoldScaleSlider()
 {
     auto layout = new QHBoxLayout();

src/widgets/settingspages/LookPage.hpp

@@ -30,7 +30,6 @@ private:
 
     QLayout *createThemeColorChanger();
     QLayout *createFontChanger();
-    QLayout *createUiScaleSlider();
     QLayout *createBoldScaleSlider();
 
     ChannelPtr createPreviewChannel();