From 53e4c3443effaaf80416e5f71b6c1597dc84a26e Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Date: Fri, 14 Aug 2020 10:33:44 +0200
Subject: Native style, DesktopGallery: wrap TextArea inside ScrollView, and
 not Flickable

From the documentation for TextArea, this is the recommended approach.

Change-Id: I37428488cba6d406b3e9c6f6dae9dcab04cece79
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 .../quickcontrols2/desktopgallery/TextAreas.qml    | 57 ++++++++++++++--------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/examples/quickcontrols2/desktopgallery/TextAreas.qml b/examples/quickcontrols2/desktopgallery/TextAreas.qml
index 56c0258b..f0406146 100644
--- a/examples/quickcontrols2/desktopgallery/TextAreas.qml
+++ b/examples/quickcontrols2/desktopgallery/TextAreas.qml
@@ -63,13 +63,14 @@ ControlContainer {
                   + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
         }
 
-        Flickable {
+        ScrollView {
+            id: scrollView
             width: 200
             height: defaultTextArea.height
-            clip: true
+            ScrollBar.vertical.policy: ScrollBar.AlwaysOn
 
-            TextArea.flickable: TextArea {
-                text: "Inside flickable - Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
+            TextArea {
+                text: "Inside ScrollView - Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
                 + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
                 + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi "
                 + "ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit "
@@ -78,31 +79,47 @@ ControlContainer {
                 + "mollit anim id est laborum."
                 wrapMode: TextEdit.WordWrap
                 selectByMouse: true
+                rightPadding: scrollView.ScrollBar.vertical.width
             }
-
-            ScrollBar.vertical: ScrollBar { policy: ScrollBar.AlwaysOn }
         }
     }
 
     Row {
         spacing: container.rowSpacing
 
-        TextArea {
-            width: 200
-            wrapMode: TextEdit.WordWrap
-            selectByMouse: true
-            text: "Small - Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
-                  + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            property bool qqc2_style_small
+        Frame {
+            TextArea {
+                id: area1
+                width: 200
+                wrapMode: TextEdit.WrapAnywhere
+                selectByMouse: true
+                text: "Inside frame - Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
+                      + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            }
         }
 
-        TextArea {
-            width: 200
-            wrapMode: TextEdit.WordWrap
-            selectByMouse: true
-            text: "Mini - Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
-                  + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            property bool qqc2_style_mini
+        Frame {
+            contentWidth: 200
+            contentHeight: 100
+            ScrollView {
+                id: scrollView2
+                anchors.fill: parent
+                ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+
+                TextArea {
+                    id: area2
+                    text: "Inside Frame and ScrollView - Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
+                          + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
+                          + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi "
+                          + "ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit "
+                          + "in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur "
+                          + "sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
+                          + "mollit anim id est laborum."
+                    wrapMode: TextEdit.WordWrap
+                    selectByMouse: true
+                    rightPadding: scrollView2.ScrollBar.vertical.width
+                }
+            }
         }
 
         TextArea {
-- 
cgit v1.2.3