From cd00c2eafa1744b7bc7d8e2b074a694325669558 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 21 Feb 2014 13:33:57 +0200 Subject: Fix qmlsurfacelayers render mode button for android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib9d042a3f1176b710bfafcb5da16856fb5c1bc7d Reviewed-by: Tomi Korpipää --- .../qmlsurfacelayers/qml/qmlsurfacelayers/main.qml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers') 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" } } } -- cgit v1.2.3