Fix qmlaxisdrag example for portrait mode

Pick-to: 6.2 6.4 6.5
Fixes: QTBUG-110037
Change-Id: I240a94e73dee2e2ce30f8245798bba7b74a41b37
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

1 files changed, 13 insertions, 7 deletions

diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
index b39de3ea..b5083975 100644
--- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
+++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick
-import QtDataVisualization 1.1
+import QtDataVisualization
 import QtQuick.Controls
 import "."
 
@@ -19,6 +19,8 @@ Item {
     property int previousMouseX: -1
     property int previousMouseY: -1
 
+    property bool portraitMode: width < height
+
     ListModel {
         id: graphModel
         ListElement{ xPos: 0.0; yPos: 0.0; zPos: 0.0; rotation: "@0,0,0,0" }
@@ -61,7 +63,7 @@ Item {
                 }
             } else {
                 graphModel.remove(2, 10);
-                if (graphModel.count == 2) {
+                if (graphModel.count === 2) {
                     scatterGraph.theme = dynamicColorTheme
                     isIncreasing = true
                 }
@@ -247,9 +249,11 @@ Item {
 
     Button {
         id: rangeToggle
-        width: parent.width / 3 // We're adding 3 buttons and want to divide them equally
+        // We're adding 3 buttons and want to divide them equally, if not in portrait mode
+        width: portraitMode ? parent.width : parent.width / 3
         text: "Use Preset Range"
         anchors.left: parent.left
+        anchors.top: parent.top
         property bool autoRange: true
         onClicked: {
             if (autoRange) {
@@ -276,9 +280,10 @@ Item {
     //! [8]
     Button {
         id: orthoToggle
-        width: parent.width / 3
+        width: portraitMode ? parent.width : parent.width / 3
         text: "Display Orthographic"
-        anchors.left: rangeToggle.right
+        anchors.left: portraitMode ? parent.left : rangeToggle.right
+        anchors.top: portraitMode ? rangeToggle.bottom : parent.top
         onClicked: {
             if (scatterGraph.orthoProjection) {
                 text = "Display Orthographic";
@@ -295,9 +300,10 @@ Item {
 
     Button {
         id: exitButton
-        width: parent.width / 3
+        width: portraitMode ? parent.width : parent.width / 3
         text: "Quit"
-        anchors.left: orthoToggle.right
+        anchors.left: portraitMode ? parent.left : orthoToggle.right
+        anchors.top: portraitMode ? orthoToggle.bottom : parent.top
         onClicked: Qt.quit();
     }
 }