summary refs log tree commit diff
diff options
context:
space:
mode:
authorLoren Burkholder <computersemiexpert@outlook.com>2021-07-20 12:53:16 -0400
committerLoren Burkholder <computersemiexpert@outlook.com>2021-07-20 21:48:07 -0400
commitfa06881c49a48c69223ceac7ad3d06105db9ed50 (patch)
tree7e7c827a2f4f1f9e14fd52eb138996049c1440e9
parentFix hardcoded spacing/padding (diff)
downloadnheko-fa06881c49a48c69223ceac7ad3d06105db9ed50.tar.xz
Don't hardcode fonts
Fix hardcoded fonts (again)
-rw-r--r--resources/qml/InviteDialog.qml4
-rw-r--r--resources/qml/RoomMembers.qml6
-rw-r--r--resources/qml/RoomSettings.qml6
3 files changed, 8 insertions, 8 deletions
diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml

index e80087fc..d0e6a645 100644 --- a/resources/qml/InviteDialog.qml +++ b/resources/qml/InviteDialog.qml
@@ -111,13 +111,13 @@ ApplicationWindow { Label { text: model.displayName color: TimelineManager.userColor(model ? model.mxid : "", Nheko.colors.window) - font.pointSize: 12 + font.pointSize: fontMetrics.font.pointSize } Label { text: model.mxid color: Nheko.colors.buttonText - font.pointSize: 10 + font.pointSize: fontMetrics.font.pointSize * 0.9 } Item { diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml
index 11bd486c..b9b800c5 100644 --- a/resources/qml/RoomMembers.qml +++ b/resources/qml/RoomMembers.qml
@@ -43,7 +43,7 @@ ApplicationWindow { } Label { - font.pixelSize: 24 + font.pixelSize: fontMetrics.font.pixelSize * 2 text: members.memberCount + (members.memberCount === 1 ? qsTr(" person in ") : qsTr(" people in ")) + members.roomName Layout.alignment: Qt.AlignHCenter } @@ -97,13 +97,13 @@ ApplicationWindow { Label { text: model.displayName color: TimelineManager.userColor(model ? model.mxid : "", Nheko.colors.window) - font.pointSize: 12 + font.pointSize: fontMetrics.font.pointSize } Label { text: model.mxid color: Nheko.colors.buttonText - font.pointSize: 10 + font.pointSize: fontMetrics.font.pointSize * 0.9 } Item { diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml
index a27be13e..2701edf9 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml
@@ -98,7 +98,7 @@ ApplicationWindow { MatrixText { text: roomSettings.roomName - font.pixelSize: 24 + font.pixelSize: fontMetrics.font.pixelSize * 2 Layout.alignment: Qt.AlignHCenter } @@ -264,7 +264,7 @@ ApplicationWindow { MatrixText { text: roomSettings.roomId - font.pixelSize: 14 + font.pixelSize: fontMetrics.font.pixelSize * 1.2 Layout.alignment: Qt.AlignRight } @@ -274,7 +274,7 @@ ApplicationWindow { MatrixText { text: roomSettings.roomVersion - font.pixelSize: 14 + font.pixelSize: fontMetrics.font.pixelSize * 1.2 Layout.alignment: Qt.AlignRight }