removed appbase directory

src/singletons/Fonts.cpp

@@ -0,0 +1,181 @@
+#include "singletons/Fonts.hpp"
+
+#include "BaseSettings.hpp"
+#include "debug/AssertInGuiThread.hpp"
+
+#include <QDebug>
+#include <QtGlobal>
+
+#ifdef CHATTERINO
+#    include "Application.hpp"
+#    include "singletons/WindowManager.hpp"
+#endif
+
+#ifdef Q_OS_WIN32
+#    define DEFAULT_FONT_FAMILY "Segoe UI"
+#    define DEFAULT_FONT_SIZE 10
+#else
+#    ifdef Q_OS_MACOS
+#        define DEFAULT_FONT_FAMILY "Helvetica Neue"
+#        define DEFAULT_FONT_SIZE 12
+#    else
+#        define DEFAULT_FONT_FAMILY "Arial"
+#        define DEFAULT_FONT_SIZE 11
+#    endif
+#endif
+
+namespace chatterino {
+namespace {
+    int getBoldness()
+    {
+#ifdef CHATTERINO
+        return getSettings()->boldScale.getValue();
+#else
+        return QFont::Bold;
+#endif
+    }
+}  // namespace
+
+Fonts *Fonts::instance = nullptr;
+
+Fonts::Fonts()
+    : chatFontFamily("/appearance/currentFontFamily", DEFAULT_FONT_FAMILY)
+    , chatFontSize("/appearance/currentFontSize", DEFAULT_FONT_SIZE)
+{
+    Fonts::instance = this;
+
+    this->fontsByType_.resize(size_t(FontStyle::EndType));
+}
+
+void Fonts::initialize(Settings &, Paths &)
+{
+    this->chatFontFamily.connect(
+        [this]() {
+            assertInGuiThread();
+
+            for (auto &map : this->fontsByType_)
+            {
+                map.clear();
+            }
+            this->fontChanged.invoke();
+        },
+        false);
+
+    this->chatFontSize.connect(
+        [this]() {
+            assertInGuiThread();
+
+            for (auto &map : this->fontsByType_)
+            {
+                map.clear();
+            }
+            this->fontChanged.invoke();
+        },
+        false);
+
+#ifdef CHATTERINO
+    getSettings()->boldScale.connect(
+        [this]() {
+            assertInGuiThread();
+
+            // REMOVED
+            getApp()->windows->incGeneration();
+
+            for (auto &map : this->fontsByType_)
+            {
+                map.clear();
+            }
+            this->fontChanged.invoke();
+        },
+        false);
+#endif
+}
+
+QFont Fonts::getFont(FontStyle type, float scale)
+{
+    return this->getOrCreateFontData(type, scale).font;
+}
+
+QFontMetrics Fonts::getFontMetrics(FontStyle type, float scale)
+{
+    return this->getOrCreateFontData(type, scale).metrics;
+}
+
+Fonts::FontData &Fonts::getOrCreateFontData(FontStyle type, float scale)
+{
+    assertInGuiThread();
+
+    assert(type < FontStyle::EndType);
+
+    auto &map = this->fontsByType_[size_t(type)];
+
+    // find element
+    auto it = map.find(scale);
+    if (it != map.end())
+    {
+        // return if found
+
+        return it->second;
+    }
+
+    // emplace new element
+    auto result = map.emplace(scale, this->createFontData(type, scale));
+    assert(result.second);
+
+    return result.first->second;
+}
+
+Fonts::FontData Fonts::createFontData(FontStyle type, float scale)
+{
+    // check if it's a chat (scale the setting)
+    if (type >= FontStyle::ChatStart && type <= FontStyle::ChatEnd)
+    {
+        static std::unordered_map<FontStyle, ChatFontData> sizeScale{
+            {FontStyle::ChatSmall, {0.6f, false, QFont::Normal}},
+            {FontStyle::ChatMediumSmall, {0.8f, false, QFont::Normal}},
+            {FontStyle::ChatMedium, {1, false, QFont::Normal}},
+            {FontStyle::ChatMediumBold,
+             {1, false, QFont::Weight(getBoldness())}},
+            {FontStyle::ChatMediumItalic, {1, true, QFont::Normal}},
+            {FontStyle::ChatLarge, {1.2f, false, QFont::Normal}},
+            {FontStyle::ChatVeryLarge, {1.4f, false, QFont::Normal}},
+        };
+        sizeScale[FontStyle::ChatMediumBold] = {1, false,
+                                                QFont::Weight(getBoldness())};
+        auto data = sizeScale[type];
+        return FontData(
+            QFont(this->chatFontFamily.getValue(),
+                  int(this->chatFontSize.getValue() * data.scale * scale),
+                  data.weight, data.italic));
+    }
+
+    // normal Ui font (use pt size)
+    {
+#ifdef Q_OS_MAC
+        constexpr float multiplier = 0.8f;
+#else
+        constexpr float multiplier = 1.f;
+#endif
+
+        static std::unordered_map<FontStyle, UiFontData> defaultSize{
+            {FontStyle::Tiny, {8, "Monospace", false, QFont::Normal}},
+            {FontStyle::UiMedium,
+             {int(9 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Normal}},
+            {FontStyle::UiMediumBold,
+             {int(9 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Bold}},
+            {FontStyle::UiTabs,
+             {int(9 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Normal}},
+        };
+
+        UiFontData &data = defaultSize[type];
+        QFont font(data.name, int(data.size * scale), data.weight, data.italic);
+        return FontData(font);
+    }
+}
+
+Fonts *getFonts()
+{
+    return Fonts::instance;
+}
+
+}  // namespace chatterino

src/singletons/Fonts.hpp

@@ -0,0 +1,93 @@
+#pragma once
+
+#include "common/ChatterinoSetting.hpp"
+#include "common/Singleton.hpp"
+
+#include <QFont>
+#include <QFontDatabase>
+#include <QFontMetrics>
+#include <boost/noncopyable.hpp>
+#include <pajlada/signals/signal.hpp>
+
+#include <array>
+#include <unordered_map>
+
+namespace chatterino {
+
+class Settings;
+class Paths;
+
+enum class FontStyle : uint8_t {
+    Tiny,
+    ChatSmall,
+    ChatMediumSmall,
+    ChatMedium,
+    ChatMediumBold,
+    ChatMediumItalic,
+    ChatLarge,
+    ChatVeryLarge,
+
+    UiMedium,
+    UiMediumBold,
+    UiTabs,
+
+    // don't remove this value
+    EndType,
+
+    // make sure to update these values accordingly!
+    ChatStart = ChatSmall,
+    ChatEnd = ChatVeryLarge,
+};
+
+class Fonts final : public Singleton
+{
+public:
+    Fonts();
+
+    virtual void initialize(Settings &settings, Paths &paths) override;
+
+    // font data gets set in createFontData(...)
+
+    QFont getFont(FontStyle type, float scale);
+    QFontMetrics getFontMetrics(FontStyle type, float scale);
+
+    QStringSetting chatFontFamily;
+    IntSetting chatFontSize;
+
+    pajlada::Signals::NoArgSignal fontChanged;
+    static Fonts *instance;
+
+private:
+    struct FontData {
+        FontData(const QFont &_font)
+            : font(_font)
+            , metrics(_font)
+        {
+        }
+
+        const QFont font;
+        const QFontMetrics metrics;
+    };
+
+    struct ChatFontData {
+        float scale;
+        bool italic;
+        QFont::Weight weight;
+    };
+
+    struct UiFontData {
+        float size;
+        const char *name;
+        bool italic;
+        QFont::Weight weight;
+    };
+
+    FontData &getOrCreateFontData(FontStyle type, float scale);
+    FontData createFontData(FontStyle type, float scale);
+
+    std::vector<std::unordered_map<float, FontData>> fontsByType_;
+};
+
+Fonts *getFonts();
+
+}  // namespace chatterino