From 0ce98fc179ecacacda4968a1ca9efdc54e7d917f Mon Sep 17 00:00:00 2001 From: Black Hat Date: Mon, 19 Nov 2018 07:29:55 +0800 Subject: [PATCH] Use pixel size. --- .../Spectral/Component/Emoji/EmojiPicker.qml | 4 +- imports/Spectral/Component/MaterialIcon.qml | 2 +- .../Component/Timeline/MessageDelegate.qml | 2 +- .../Component/Timeline/SectionDelegate.qml | 2 +- imports/Spectral/Panel/RoomHeader.qml | 2 +- imports/Spectral/Panel/RoomListPanel.qml | 38 +++++++++---------- imports/Spectral/Panel/RoomPanelInput.qml | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/imports/Spectral/Component/Emoji/EmojiPicker.qml b/imports/Spectral/Component/Emoji/EmojiPicker.qml index c4b9cd4..c8651bb 100644 --- a/imports/Spectral/Component/Emoji/EmojiPicker.qml +++ b/imports/Spectral/Component/Emoji/EmojiPicker.qml @@ -46,7 +46,7 @@ ColumnLayout { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - font.pointSize: 24 + font.pixelSize: 24 font.family: "Emoji" text: label } @@ -94,7 +94,7 @@ ColumnLayout { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - font.pointSize: 20 + font.pixelSize: 32 font.family: "Emoji" text: modelData.unicode } diff --git a/imports/Spectral/Component/MaterialIcon.qml b/imports/Spectral/Component/MaterialIcon.qml index d3fa219..593b232 100644 --- a/imports/Spectral/Component/MaterialIcon.qml +++ b/imports/Spectral/Component/MaterialIcon.qml @@ -12,7 +12,7 @@ Text { id: materialLabel color: Material.foreground - font.pointSize: 16 + font.pixelSize: 24 font.family: MaterialFont.name horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml index e9494a5..40d04bf 100644 --- a/imports/Spectral/Component/Timeline/MessageDelegate.qml +++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml @@ -85,7 +85,7 @@ RowLayout { color: "white" font.family: CommonFont.font.family - font.pointSize: 10.5 + font.pixelSize: 14 selectByMouse: true readOnly: true wrapMode: Label.Wrap diff --git a/imports/Spectral/Component/Timeline/SectionDelegate.qml b/imports/Spectral/Component/Timeline/SectionDelegate.qml index 59d4307..6db3e26 100644 --- a/imports/Spectral/Component/Timeline/SectionDelegate.qml +++ b/imports/Spectral/Component/Timeline/SectionDelegate.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 Label { text: section + " • " + Qt.formatTime(time, "hh:mm") - font.pointSize: 9.75 + font.pixelSize: 13 font.weight: Font.Medium font.capitalization: Font.AllUppercase verticalAlignment: Text.AlignVCenter diff --git a/imports/Spectral/Panel/RoomHeader.qml b/imports/Spectral/Panel/RoomHeader.qml index 619e80e..6b02202 100644 --- a/imports/Spectral/Panel/RoomHeader.qml +++ b/imports/Spectral/Panel/RoomHeader.qml @@ -52,7 +52,7 @@ Control { Layout.fillHeight: true text: currentRoom ? currentRoom.displayName : "" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } diff --git a/imports/Spectral/Panel/RoomListPanel.qml b/imports/Spectral/Panel/RoomListPanel.qml index d375470..1029522 100644 --- a/imports/Spectral/Panel/RoomListPanel.qml +++ b/imports/Spectral/Panel/RoomListPanel.qml @@ -125,7 +125,7 @@ Rectangle { text: root.user ? root.user.displayName : "No Name" color: "white" - font.pointSize: 16.5 + font.pixelSize: 22 } Label { @@ -134,7 +134,7 @@ Rectangle { text: root.user ? root.user.id : "@example:matrix.org" color: "white" opacity: 0.7 - font.pointSize: 9.75 + font.pixelSize: 13 } } @@ -246,7 +246,7 @@ Rectangle { Layout.fillHeight: true text: "Matrix ID" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -257,7 +257,7 @@ Rectangle { text: root.user.id color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -277,7 +277,7 @@ Rectangle { Layout.fillHeight: true text: "Name" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -288,7 +288,7 @@ Rectangle { text: root.user.name color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -308,7 +308,7 @@ Rectangle { Layout.fillHeight: true text: "Avatar" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -319,7 +319,7 @@ Rectangle { text: root.user.avatarMediaId color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -339,7 +339,7 @@ Rectangle { Layout.fillHeight: true text: "Server" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -350,7 +350,7 @@ Rectangle { text: root.controller.connection.accessToken color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -370,7 +370,7 @@ Rectangle { Layout.fillHeight: true text: "Device" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -381,7 +381,7 @@ Rectangle { text: root.controller.connection.deviceId color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -401,7 +401,7 @@ Rectangle { Layout.fillHeight: true text: "Token" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -412,7 +412,7 @@ Rectangle { text: root.controller.connection.accessToken color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -528,7 +528,7 @@ Rectangle { text: stackView.currentItem.title color: "white" - font.pointSize: 13.5 + font.pixelSize: 18 elide: Label.ElideRight } } @@ -688,7 +688,7 @@ Rectangle { Layout.fillWidth: true text: errorControl.error - font.pointSize: 12 + font.pixelSize: 16 color: "white" wrapMode: Text.Wrap } @@ -696,7 +696,7 @@ Rectangle { Layout.fillWidth: true text: errorControl.detail - font.pointSize: 10.5 + font.pixelSize: 14 color: "white" opacity: 0.6 wrapMode: Text.Wrap @@ -778,7 +778,7 @@ Rectangle { Layout.fillHeight: true text: name || "No Name" - font.pointSize: 12 + font.pixelSize: 16 elide: Text.ElideRight wrapMode: Text.NoWrap } @@ -789,7 +789,7 @@ Rectangle { text: (lastEvent == "" ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm,"") color: "#5B7480" - font.pointSize: 9.75 + font.pixelSize: 13 elide: Text.ElideRight wrapMode: Text.NoWrap } diff --git a/imports/Spectral/Panel/RoomPanelInput.qml b/imports/Spectral/Panel/RoomPanelInput.qml index 30e839f..4513bd5 100644 --- a/imports/Spectral/Panel/RoomPanelInput.qml +++ b/imports/Spectral/Panel/RoomPanelInput.qml @@ -80,7 +80,7 @@ Control { height: parent.height visible: isEmoji text: autoCompleteText - font.pointSize: 16 + font.pixelSize: 20 font.family: "Emoji" verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter