summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-11-02 14:56:56 +0200
committerPasi Keränen <pasi.keranen@digia.com>2015-11-03 04:52:32 +0000
commitf201e2c2ea32e29a5e8cc6ecd8ce8b9bb5c99319 (patch)
tree091cf2dee8a7da7f9cd3fc27f24dfc88ba82b6c9
parenta84dad27182ba6cb4c6f9bf4008a9e63346a7a83 (diff)
Tweak some examples to make them look better on Android
Change-Id: I287e8fb36c95a65eb14c846d430f759ebdf5750e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
-rw-r--r--examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml2
-rw-r--r--examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml8
-rw-r--r--examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml3
-rw-r--r--examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml4
4 files changed, 7 insertions, 10 deletions
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml b/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
index 3c16683..433e226 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
+++ b/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
@@ -72,7 +72,7 @@ Window {
+ "Z Rot:" + (canvas3d.zRotAnim | 0) + "\n"
+ "FPS:" + canvas3d.fps
color: "red"
- font.pointSize: 30
+ font.pointSize: 26
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
}
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml b/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
index f35a950..2808f6a 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
@@ -95,7 +95,7 @@ Item {
id: heading1
text: ""
font.family: "Helvetica"
- font.pixelSize: 3.0 * 16
+ font.pointSize: 36
font.weight: Font.Light
color: "black"
@@ -105,7 +105,7 @@ Item {
anchors.left: heading1.right
text: ""
font.family: "Helvetica"
- font.pixelSize: 3.0 * 16
+ font.pointSize: 36
font.weight: Font.Light
color: "#5caa15"
}
@@ -123,10 +123,8 @@ Item {
text: ""
width: (infoSheet.width - infoSheet.anchors.leftMargin) * 0.3
font.family: "Helvetica"
- font.pixelSize: 16
+ font.pointSize: 16
font.weight: Font.Light
- lineHeight: 1.625 * 16
- lineHeightMode: Text.FixedHeight
}
}
}
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml b/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
index ca9b02b..80f3f02 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
@@ -41,8 +41,7 @@ Text {
id: menubarItem
text: ""
font.family: "Helvetica"
- font.pixelSize: 1.125 * 16
- //font.pointSize: 20
+ font.pointSize: 20
font.weight: Font.Light
color: "#404244"
Layout.alignment: Qt.AlignHCenter
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml
index 0bf6ace..8534f4c 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml
+++ b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml
@@ -306,7 +306,7 @@ Item {
text: "Your productivity is at the core of what drives us. We made creating embedded<br>"+
"devices agile and painless without sacrificing maximum native performance. You get<br>"+
"to write your application using high level C++ libraries with no need to worry about<br>"+
- "nasty platform details. Using Qt Creator IDE and with a variety of UI approaches to<br"+
+ "nasty platform details. Using Qt Creator IDE and with a variety of UI approaches to<br>"+
"choose from you can create the optimal UX for your end users."
}
@@ -321,7 +321,7 @@ Item {
headingText2: "is Our Specialty"
text: "We make cross-platform application development easy. Target all the screens in your<br>"+
"end users’ lives. You only need to write and maintain one code base regardless of<br>"+
- "what kind of and how many target platforms you might have and we’re talking about<br"+
+ "what kind of and how many target platforms you might have and we’re talking about<br>"+
"all major operating systems here. No need for separate implementations for<br>"+
"different user devices. Qt makes your time-to-market faster, technology strategy<br>"+
"simpler and future-proof, consequently reducing costs."