tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dpi' into 'material' 

DPI Fixes

See merge request b0/spectral!31
This commit is contained in:
Black Hat 2018-11-19 12:14:32 +00:00
parent c95ff1b4a0 0ce98fc179
commit f892236bfe
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imports/Spectral/Component/Emoji/EmojiPicker.qml
View File

@ -46,7 +46,7 @@ ColumnLayout {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 24 font.pixelSize: 24
font.family: "Emoji" font.family: "Emoji"
text: label text: label
} }
@ -94,7 +94,7 @@ ColumnLayout {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 20 font.pixelSize: 32
font.family: "Emoji" font.family: "Emoji"
text: modelData.unicode text: modelData.unicode
} }

2
imports/Spectral/Component/MaterialIcon.qml
View File

@ -12,7 +12,7 @@ Text {
id: materialLabel id: materialLabel
color: Material.foreground color: Material.foreground
font.pointSize: 16 font.pixelSize: 24
font.family: MaterialFont.name font.family: MaterialFont.name
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

2
imports/Spectral/Component/Timeline/MessageDelegate.qml
View File

@ -85,7 +85,7 @@ RowLayout {
color: "white" color: "white"
font.family: CommonFont.font.family font.family: CommonFont.font.family
font.pointSize: 10.5 font.pixelSize: 14
selectByMouse: true selectByMouse: true
readOnly: true readOnly: true
wrapMode: Label.Wrap wrapMode: Label.Wrap

2
imports/Spectral/Component/Timeline/SectionDelegate.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.2
Label { Label {
text: section + " • " + Qt.formatTime(time, "hh:mm") text: section + " • " + Qt.formatTime(time, "hh:mm")
font.pointSize: 9.75 font.pixelSize: 13
font.weight: Font.Medium font.weight: Font.Medium
font.capitalization: Font.AllUppercase font.capitalization: Font.AllUppercase
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

2
imports/Spectral/Panel/RoomHeader.qml
View File

@ -52,7 +52,7 @@ Control {
Layout.fillHeight: true Layout.fillHeight: true
text: currentRoom ? currentRoom.displayName : "" text: currentRoom ? currentRoom.displayName : ""
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }

38
imports/Spectral/Panel/RoomListPanel.qml
View File

@ -125,7 +125,7 @@ Rectangle {
text: root.user ? root.user.displayName : "No Name" text: root.user ? root.user.displayName : "No Name"
color: "white" color: "white"
font.pointSize: 16.5 font.pixelSize: 22
} }
Label { Label {
@ -134,7 +134,7 @@ Rectangle {
text: root.user ? root.user.id : "@example:matrix.org" text: root.user ? root.user.id : "@example:matrix.org"
color: "white" color: "white"
opacity: 0.7 opacity: 0.7
font.pointSize: 9.75 font.pixelSize: 13
} }
} }
@ -246,7 +246,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: "Matrix ID" text: "Matrix ID"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -257,7 +257,7 @@ Rectangle {
text: root.user.id text: root.user.id
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -277,7 +277,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: "Name" text: "Name"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -288,7 +288,7 @@ Rectangle {
text: root.user.name text: root.user.name
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -308,7 +308,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: "Avatar" text: "Avatar"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -319,7 +319,7 @@ Rectangle {
text: root.user.avatarMediaId text: root.user.avatarMediaId
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -339,7 +339,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: "Server" text: "Server"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -350,7 +350,7 @@ Rectangle {
text: root.controller.connection.accessToken text: root.controller.connection.accessToken
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -370,7 +370,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: "Device" text: "Device"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -381,7 +381,7 @@ Rectangle {
text: root.controller.connection.deviceId text: root.controller.connection.deviceId
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -401,7 +401,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: "Token" text: "Token"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -412,7 +412,7 @@ Rectangle {
text: root.controller.connection.accessToken text: root.controller.connection.accessToken
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -528,7 +528,7 @@ Rectangle {
text: stackView.currentItem.title text: stackView.currentItem.title
color: "white" color: "white"
font.pointSize: 13.5 font.pixelSize: 18
elide: Label.ElideRight elide: Label.ElideRight
} }
} }
@ -688,7 +688,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
text: errorControl.error text: errorControl.error
font.pointSize: 12 font.pixelSize: 16
color: "white" color: "white"
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
@ -696,7 +696,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
text: errorControl.detail text: errorControl.detail
font.pointSize: 10.5 font.pixelSize: 14
color: "white" color: "white"
opacity: 0.6 opacity: 0.6
wrapMode: Text.Wrap wrapMode: Text.Wrap
@ -778,7 +778,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
text: name || "No Name" text: name || "No Name"
font.pointSize: 12 font.pixelSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -789,7 +789,7 @@ Rectangle {
text: (lastEvent == "" ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm,"") text: (lastEvent == "" ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm,"")
color: "#5B7480" color: "#5B7480"
font.pointSize: 9.75 font.pixelSize: 13
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }

2
imports/Spectral/Panel/RoomPanelInput.qml
View File

@ -80,7 +80,7 @@ Control {
height: parent.height height: parent.height
visible: isEmoji visible: isEmoji
text: autoCompleteText text: autoCompleteText
font.pointSize: 16 font.pixelSize: 20
font.family: "Emoji" font.family: "Emoji"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter