Switch to and reset font.pixelSize to avoid the headache

I don't know why I used pointSize in the first place but it was not a good choice. This also adds the ability to choose a different font size for messages. Previous settings will be ignored, sorry. Closes #163
LithApp · Oct 14, 2023 · a85c6a8 · a85c6a8
1 parent dda02b3
commit a85c6a8
Show file tree

Hide file tree

Showing 29 changed files with 158 additions and 103 deletions.
diff --git a/app/main.cpp b/app/main.cpp
@@ -91,14 +91,12 @@ int main(int argc, char* argv[]) {
     QFont font("Inconsolata");
 #endif
     if (fontFamilyFromSettings.length() != 0) {  // fontFamilyFromSettings could be NULL (unlikely) or empty (not so unlikely)
-        font = QFont(fontFamilyFromSettings
-        );  // if the font doesn't exist, it doesn't matter atm, Qt fallsback to a monospace font on our behalf
+        // if the font doesn't exist, it doesn't matter atm, Qt fallsback to a monospace font on our behalf
+        font = QFont(fontFamilyFromSettings);
     }
-    font.setKerning(false);
-    font.setHintingPreference(QFont::PreferNoHinting);
     font.setStyleHint(QFont::Monospace);
+    font.setPixelSize(Settings::instance()->baseFontPixelSizeGet());
     app.setFont(font);
-    app.setFont(font, "monospace");
 
     // Start the engine
     engine.load(QUrl(QLatin1String("qrc:/qt/qml/App/main.qml")));

diff --git a/modules/Lith/Core/settings.h b/modules/Lith/Core/settings.h
@@ -68,14 +68,16 @@ class LITHCORE_EXPORT Settings : public QObject {
     static inline const QStringList c_hotlistDefaultFormat {"%1: %2/%3", "short_name", "hotMessages", "unreadMessages"};
 
     SETTING(int, lastOpenBuffer, -1)
-// TODO revisit this, it's really really awkward to have different defaults for both font size and face
+// TODO revisit this, it's really really awkward to have different defaults for font families
 #if defined(Q_OS_MACOS)
     SETTING(QString, baseFontFamily, "Menlo")
-    SETTING(qreal, baseFontSize, 13)
 #else
     SETTING(QString, baseFontFamily, "Inconsolata")
-    SETTING(qreal, baseFontSize, 11)
 #endif
+    SETTING(int, baseFontPixelSize, 14)
+    SETTING(bool, useBaseFontPixelSizeForMessages, true)
+    SETTING(int, messageFontPixelSize, 14)
+
     SETTING(bool, shortenLongUrls, true)
     SETTING(int, shortenLongUrlsThreshold, 50)
     SETTING(int, nickCutoffThreshold, -1)

diff --git a/modules/Lith/Style/Button.qml b/modules/Lith/Style/Button.qml
@@ -21,7 +21,7 @@ T.Button {
     icon.width: 32
     icon.height: 32
 
-    font.pointSize: Lith.settings.baseFontSize
+    font.pixelSize: FontSizes.regular
 
     contentItem: Item {
 

diff --git a/modules/Lith/Style/CheckBox.qml b/modules/Lith/Style/CheckBox.qml
@@ -19,7 +19,7 @@ T.CheckBox {
 
     indicator: Rectangle {
         id: backgroundRect
-        implicitWidth: 26 * Math.max(1.0, Lith.settings.baseFontSize / 20)
+        implicitWidth: FontSizes.regular + 12
         implicitHeight: implicitWidth
         anchors.verticalCenter: parent.verticalCenter
 

diff --git a/modules/Lith/Style/ItemDelegate.qml b/modules/Lith/Style/ItemDelegate.qml
@@ -20,7 +20,7 @@ T.ItemDelegate {
     icon.height: 24
     icon.color: control.LithPalette.regular.text
 
-    font.pointSize: Lith.settings.baseFontSize
+    font.pixelSize: FontSizes.regular
 
     property alias textFormat: label.textFormat
 
@@ -30,7 +30,6 @@ T.ItemDelegate {
         text: control.text
         font: control.font
         color: control.checked ? LithPalette.regular.highlightedText : LithPalette.regular.text
-        size: Label.Large
     }
 
     background: Rectangle {

diff --git a/modules/Lith/Style/Label.qml b/modules/Lith/Style/Label.qml
@@ -5,33 +5,6 @@ import Lith.Core
 import Lith.Style
 
 T.Label {
-    enum Size {
-        Tiny,
-        Small,
-        Regular,
-        Medium,
-        Large,
-        Header
-    }
-    property int size: Label.Size.Regular
-
     color: LithPalette.regular.windowText
-
-    font.pointSize: {
-        switch (size) {
-        case Label.Tiny:
-            return Lith.settings.baseFontSize * 0.75
-        case Label.Small:
-            return Lith.settings.baseFontSize * 0.875
-        case Label.Regular:
-            return Lith.settings.baseFontSize
-        case Label.Medium:
-            return Lith.settings.baseFontSize * 1.125
-        case Label.Large:
-            return Lith.settings.baseFontSize * 1.25
-        case Label.Header:
-            return Lith.settings.baseFontSize * 1.375
-        }
-        return Lith.settings.baseFontSize
-    }
+    font.pixelSize: FontSizes.regular
 }
diff --git a/modules/Lith/Style/RadioButton.qml b/modules/Lith/Style/RadioButton.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Templates as T
 
 import Lith.Core
+import Lith.Style
 
 T.RadioButton {
     id: control
@@ -19,7 +20,7 @@ T.RadioButton {
 
     indicator: Rectangle {
         id: backgroundRect
-        implicitWidth: 26 * Math.max(1.0, Lith.settings.baseFontSize / 20)
+        implicitWidth: FontSizes.regular + 12
         implicitHeight: implicitWidth
         anchors.verticalCenter: parent.verticalCenter
 

diff --git a/modules/Lith/Style/SpinBox.qml b/modules/Lith/Style/SpinBox.qml
@@ -20,6 +20,8 @@ T.SpinBox {
     leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0))
     rightPadding: padding + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0))
 
+    font.pixelSize: FontSizes.regular
+
     validator: IntValidator {
         locale: control.locale.name
         bottom: Math.min(control.from, control.to)

diff --git a/modules/Lith/Style/Switch.qml b/modules/Lith/Style/Switch.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Templates as T
 
 import Lith.Core
+import Lith.Style
+import Lith.UI
 
 T.Switch {
     id: control
@@ -15,7 +17,7 @@ T.Switch {
     property color onColor: LithPalette.regular.highlight
     property color offColor: LithPalette.regular.window
 
-    font.pointSize: Lith.settings.baseFontSize
+    font.pixelSize: FontSizes.regular
 
     indicator: Rectangle {
         id: backgroundRect

diff --git a/modules/Lith/Style/TabButton.qml b/modules/Lith/Style/TabButton.qml
@@ -20,7 +20,7 @@ T.TabButton {
     icon.width: 28
     icon.height: 28
 
-    font.pointSize: Lith.settings.baseFontSize
+    font.pixelSize: FontSizes.regular
 
     contentItem: IconLabel {
         spacing: control.spacing

diff --git a/modules/Lith/Style/TextArea.qml b/modules/Lith/Style/TextArea.qml
@@ -18,7 +18,7 @@ T.TextArea {
     placeholderTextColor: LithPalette.disabled.text
     verticalAlignment: Text.AlignVCenter
 
-    font.pointSize: Lith.settings.baseFontSize
+    font.pixelSize: FontSizes.regular
 
     property color borderColor: "transparent"
     property color backgroundColor: "transparent"
@@ -52,7 +52,7 @@ T.TextArea {
             horizontalAlignment: control.horizontalAlignment
             leftPadding: control.leftPadding
             rightPadding: control.rightPadding
-            font.pointSize: control.font.pointSize
+            font.pixelSize: control.font.pixelSize
             color: control.placeholderTextColor
             text: control.placeholderText
         }

diff --git a/modules/Lith/Style/TextField.qml b/modules/Lith/Style/TextField.qml
@@ -18,7 +18,7 @@ T.TextField {
     placeholderTextColor: LithPalette.disabled.text
     verticalAlignment: Text.AlignVCenter
 
-    font.pointSize: Lith.settings.baseFontSize
+    font.pixelSize: FontSizes.regular
 
     property color borderColor: "transparent"
     property color backgroundColor: ColorUtils.mixColors(LithPalette.regular.window, LithPalette.regular.base, control.enabled ? 0.5 : 0.95)
@@ -50,7 +50,7 @@ T.TextField {
             horizontalAlignment: control.horizontalAlignment
             leftPadding: control.leftPadding
             rightPadding: control.rightPadding
-            font.pointSize: control.font.pointSize
+            font.pixelSize: control.font.pixelSize
             color: control.placeholderTextColor
             text: control.placeholderText
         }

diff --git a/modules/Lith/Style/constants.cpp b/modules/Lith/Style/constants.cpp
@@ -5,29 +5,44 @@
 
 FontSizes::FontSizes(QObject* parent)
     : m_settings(Lith::settingsGet()) {
-    connect(m_settings, &Settings::baseFontSizeChanged, this, &FontSizes::fontSizesChanged);
+    connect(m_settings, &Settings::baseFontPixelSizeChanged, this, &FontSizes::fontSizesChanged);
+    connect(m_settings, &Settings::useBaseFontPixelSizeForMessagesChanged, this, &FontSizes::messageChanged);
+    connect(m_settings, &Settings::messageFontPixelSizeChanged, this, &FontSizes::messageChanged);
+    connect(this, &FontSizes::fontSizesChanged, this, [this]() {
+        if (m_settings->useBaseFontPixelSizeForMessagesGet()) {
+            emit messageChanged();
+        }
+    });
 }
 
-qreal FontSizes::tiny() const {
-    return 0.75 * m_settings->baseFontSizeGet();
+int FontSizes::tiny() const {
+    return 0.75 * m_settings->baseFontPixelSizeGet();
 }
 
-qreal FontSizes::small() const {
-    return 0.875 * m_settings->baseFontSizeGet();
+int FontSizes::small() const {
+    return 0.875 * m_settings->baseFontPixelSizeGet();
 }
 
-qreal FontSizes::regular() const {
-    return 1.0 * m_settings->baseFontSizeGet();
+int FontSizes::regular() const {
+    return m_settings->baseFontPixelSizeGet();
 }
 
-qreal FontSizes::medium() const {
-    return 1.125 * m_settings->baseFontSizeGet();
+int FontSizes::medium() const {
+    return 1.125 * m_settings->baseFontPixelSizeGet();
 }
 
-qreal FontSizes::large() const {
-    return 1.25 * m_settings->baseFontSizeGet();
+int FontSizes::large() const {
+    return 1.25 * m_settings->baseFontPixelSizeGet();
 }
 
-qreal FontSizes::header() const {
-    return 1.375 * m_settings->baseFontSizeGet();
+int FontSizes::header() const {
+    return 1.375 * m_settings->baseFontPixelSizeGet();
+}
+
+int FontSizes::message() const {
+    if (m_settings->useBaseFontPixelSizeForMessagesGet()) {
+        return regular();
+    } else {
+        return m_settings->messageFontPixelSizeGet();
+    }
 }
diff --git a/modules/Lith/Style/constants.h b/modules/Lith/Style/constants.h
@@ -8,26 +8,31 @@ class FontSizes : public QObject {
     Q_OBJECT
     QML_ELEMENT
     QML_SINGLETON
-    Q_PROPERTY(qreal tiny READ tiny NOTIFY fontSizesChanged)
-    Q_PROPERTY(qreal small READ small NOTIFY fontSizesChanged)
-    Q_PROPERTY(qreal regular READ regular NOTIFY fontSizesChanged)
-    Q_PROPERTY(qreal medium READ medium NOTIFY fontSizesChanged)
-    Q_PROPERTY(qreal large READ large NOTIFY fontSizesChanged)
-    Q_PROPERTY(qreal header READ header NOTIFY fontSizesChanged)
+    Q_PROPERTY(int tiny READ tiny NOTIFY fontSizesChanged)
+    Q_PROPERTY(int small READ small NOTIFY fontSizesChanged)
+    Q_PROPERTY(int regular READ regular NOTIFY fontSizesChanged)
+    Q_PROPERTY(int medium READ medium NOTIFY fontSizesChanged)
+    Q_PROPERTY(int large READ large NOTIFY fontSizesChanged)
+    Q_PROPERTY(int header READ header NOTIFY fontSizesChanged)
+
+    Q_PROPERTY(int message READ message NOTIFY messageChanged)
 public:
     explicit FontSizes(QObject* parent = nullptr);
     static FontSizes* create(QQmlEngine* qmlEngine, QJSEngine* jsEngine) {
         return new FontSizes(qmlEngine);
     }
 
-    qreal tiny() const;
-    qreal small() const;
-    qreal regular() const;
-    qreal medium() const;
-    qreal large() const;
-    qreal header() const;
+    int tiny() const;
+    int small() const;
+    int regular() const;
+    int medium() const;
+    int large() const;
+    int header() const;
+
+    int message() const;
 signals:
     void fontSizesChanged();
+    void messageChanged();
 
 private:
     Settings* m_settings = nullptr;

diff --git a/modules/Lith/UI/BufferList.qml b/modules/Lith/UI/BufferList.qml
@@ -201,7 +201,7 @@ Item {
                     radius: 2
                     Label {
                         text: buffer && buffer.number > 0 ? buffer.number : ""
-                        font.pointSize: FontSizes.small
+                        font.pixelSize: FontSizes.small
                         anchors.centerIn: parent
                         color: buffer && buffer.number > 0 && buffer.number <= 10 && !buffer.isServer ? LithPalette.regular.text : LithPalette.disabled.text
                     }

diff --git a/modules/Lith/UI/ChannelHeader.qml b/modules/Lith/UI/ChannelHeader.qml
@@ -123,7 +123,7 @@ Rectangle {
                 elide: Label.ElideRight
                 wrapMode: Label.Wrap
                 maximumLineCount: 2
-                font.pointSize: FontSizes.tiny
+                font.pixelSize: FontSizes.tiny
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 onLinkActivated: {

diff --git a/modules/Lith/UI/ChannelMessage.qml b/modules/Lith/UI/ChannelMessage.qml
@@ -120,6 +120,7 @@ Item {
         visible: text.length > 0
         width: parent.width
         horizontalAlignment: Label.AlignHCenter
+        font.pixelSize: FontSizes.message
         topPadding: 3
         bottomPadding: 3
         Rectangle {
@@ -152,6 +153,7 @@ Item {
             spacing: 0
             Label {
                 Layout.alignment: Qt.AlignTop
+                font.pixelSize: FontSizes.message
                 text: messageModel.date.toLocaleString(Qt.locale(), Lith.settings.timestampFormat) + "\u00A0"
                 color: LithPalette.disabled.text
                 textFormat: Text.RichText
@@ -161,6 +163,7 @@ Item {
             Label {
                 id: nickLabel
                 Layout.alignment: Qt.AlignTop
+                font.pixelSize: FontSizes.message
                 font.bold: true
                 visible: Lith.settings.nickCutoffThreshold !== 0
                 text: messageModel.prefix.toTrimmedHtml(Lith.settings.nickCutoffThreshold) + "\u00A0"
@@ -177,6 +180,7 @@ Item {
                     id: messageText
                     text: messageModel.message
                     Layout.fillWidth: true
+                    font.pixelSize: FontSizes.message
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                     color: LithPalette.regular.text
                     textFormat: Text.RichText

diff --git a/modules/Lith/UI/ChannelMessageActionMenu.qml b/modules/Lith/UI/ChannelMessageActionMenu.qml
@@ -51,7 +51,7 @@ Dialog {
         topPadding: 20
         text: qsTr("Copy")
         font.bold: true
-        font.pointSize: FontSizes.medium
+        font.pixelSize: FontSizes.medium
         horizontalAlignment: Label.AlignHCenter
     }
 

diff --git a/modules/Lith/UI/ChannelMessageList.qml b/modules/Lith/UI/ChannelMessageList.qml
@@ -46,7 +46,7 @@ ListView {
     TextMetrics {
         id: timeMetrics
         text: Qt.formatTime(new Date(), Locale.LongFormat)
-        font.pointSize: Lith.settings.baseFontSize
+        font.pixelSize: FontSizes.regular
     }
 
     ScrollBar.vertical: ScrollBar {

diff --git a/modules/Lith/UI/HotListItem.qml b/modules/Lith/UI/HotListItem.qml
@@ -12,8 +12,7 @@ Rectangle {
     property bool hot: false
 
     property real layoutSpacing
-    readonly property real textSize: theLabel.font.pointSize
-    readonly property int labelType: Lith.settings.hotlistCompact ? Label.Small : Label.Regular
+    readonly property real textSize: Lith.settings.hotlistCompact ? FontSizes.small : FontSizes.regular
     readonly property real padding: Lith.settings.hotlistCompact ? 8 : 16
 
     signal clicked
@@ -29,7 +28,6 @@ Rectangle {
         spacing: Lith.settings.hotlistCompact ? 1 : 3
         Label {
             id: theLabel
-            size: root.labelType
             font.bold: true
             color: hot ? LithPalette.regular.highlightedText : LithPalette.regular.window
         }