summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-21 13:33:57 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-02-21 13:36:48 +0200
commitcd00c2eafa1744b7bc7d8e2b074a694325669558 (patch)
tree08d7d1f54084ce459cb3a0353d19ce294d918758 /examples
parent57db4ab218a4e43bbdee64f9de226f77aa0f9b24 (diff)
Fix qmlsurfacelayers render mode button for android
Change-Id: Ib9d042a3f1176b710bfafcb5da16856fb5c1bc7d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml17
1 files changed, 12 insertions, 5 deletions
diff --git a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
index bd68ff69..0be991bc 100644
--- a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
+++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
@@ -237,25 +237,32 @@ Item {
Layout.fillWidth: true
Layout.minimumHeight: 40
onClicked: {
+ var modeText = "Indirect "
+ var aaText
if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
surfaceLayers.msaaSamples === 0) {
surfaceLayers.renderingMode = AbstractGraph3D.RenderDirectToBackground
- renderLabel.text = "Background, " + surfaceLayers.msaaSamples + "xMSAA"
+ modeText = "BackGround "
} else if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
surfaceLayers.msaaSamples === 4) {
surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
surfaceLayers.msaaSamples = 0
- renderLabel.text = "Indirect, No AA"
} else if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
surfaceLayers.msaaSamples === 8) {
surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
surfaceLayers.msaaSamples = 4
- renderLabel.text = "Indirect, 4xMSAA"
} else {
surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
surfaceLayers.msaaSamples = 8
- renderLabel.text = "Indirect, 8xMSAA"
}
+
+ if (surfaceLayers.msaaSamples <= 0) {
+ aaText = "No AA"
+ } else {
+ aaText = surfaceLayers.msaaSamples + "xMSAA"
+ }
+
+ renderLabel.text = modeText + aaText
}
}
@@ -265,7 +272,7 @@ Item {
Layout.minimumHeight: 40
enabled: false
horizontalAlignment: TextInput.AlignHCenter
- text: "Indirect, 4xMSAA"
+ text: "Indirect, " + surfaceLayers.msaaSamples + "xMSAA"
}
}
}