Merge pull request #320 from amnezia-vpn/bugfix/scroll_stuck_on_fl_te…

…xtarea fixed scroll stuck on textarea in page OpenVpnSettings
amnezia-vpn · Sep 18, 2023 · fd9f9ee · fd9f9ee
2 parents fd09321 + 29e8f8f
commit fd9f9ee
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/client/ui/qml/Controls2/TextAreaType.qml b/client/ui/qml/Controls2/TextAreaType.qml
@@ -16,6 +16,9 @@ Rectangle {
     radius: 16
 
     FlickableType {
+        id: fl
+        interactive: false
+
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         contentHeight: textArea.implicitHeight
@@ -41,12 +44,23 @@ Rectangle {
             placeholderText: root.placeholderText
             text: root.text
 
+            onCursorVisibleChanged:  {
+                if (textArea.cursorVisible) {
+                    fl.interactive = true
+                } else {
+                    fl.interactive = false
+                }
+            }
+
             wrapMode: Text.Wrap
 
             MouseArea {
                 anchors.fill: parent
                 acceptedButtons: Qt.RightButton
-                onClicked: contextMenu.open()
+                onClicked: {
+                    fl.interactive = true
+                    contextMenu.open()
+                }
             }
 
             ContextMenuType {