mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile, QML: do not user a local font metric object

Browse source 
This theme test display created a new local FontMetrics object, that
does not per definition correspond with the "global" font metric
as defined in main.qml. The fix is simple. Display the font theme
data based on the one and only font metric from main.qml

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-09-25 12:33:19 +02:00
parent 5480d08d15
commit a9c6b1472b
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mobile-widgets/qml/ThemeTest.qml
View file

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.2
import QtQuick.Controls 2.2 as Controls import QtQuick.Controls 2.2 as Controls
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import org.kde.kirigami 2.2 as Kirigami import org.kde.kirigami 2.2 as Kirigami
import org.subsurfacedivelog.mobile 1.0
Kirigami.Page { Kirigami.Page {
@ -25,9 +26,6 @@ Kirigami.Page {
Layout.columnSpan: 2 Layout.columnSpan: 2
level: 3 level: 3
} }
FontMetrics {
id: fm
}
Controls.Label { Controls.Label {
text: "Geometry (pixels):" text: "Geometry (pixels):"
@ -67,35 +65,35 @@ Kirigami.Page {
text: "FontMetrics pointSize:" text: "FontMetrics pointSize:"
} }
Controls.Label { Controls.Label {
text: fm.font.pointSize text: fontMetrics.font.pointSize
} }
Controls.Label { Controls.Label {
text: "FontMetrics pixelSize:" text: "FontMetrics pixelSize:"
} }
Controls.Label { Controls.Label {
text: Number(fm.height).toFixed(2) text: Number(fontMetrics.height).toFixed(2)
} }
Controls.Label { Controls.Label {
text: "FontMetrics devicePixelRatio:" text: "FontMetrics devicePixelRatio:"
} }
Controls.Label { Controls.Label {
text: Number(fm.height / fm.font.pointSize).toFixed(2) text: Number(fontMetrics.height / fontMetrics.font.pointSize).toFixed(2)
} }
Controls.Label { Controls.Label {
text: "Text item pixelSize:" text: "Text item pixelSize:"
} }
Text { Text {
text: font.pixelSize text: fontMetrics.font.pixelSize
} }
Controls.Label { Controls.Label {
text: "Text item pointSize:" text: "Text item pointSize:"
} }
Text { Text {
text: font.pointSize text: fontMetrics.font.pointSize
} }
Controls.Label { Controls.Label {
@ -109,7 +107,7 @@ Kirigami.Page {
text: "Height of default font:" text: "Height of default font:"
} }
Text { Text {
text: Number(font.pixelSize / Screen.pixelDensity).toFixed(2) + "mm" text: Number(fontMetrics.font.pixelSize / Screen.pixelDensity).toFixed(2) + "mm"
} }
Controls.Label { Controls.Label {