Replace some TextField with .background usage with TextInput, avoidin…

…g customisation warnings on macOS
graphia-app · Oct 20, 2023 · 1a5bf52 · 1a5bf52
1 parent 8cea7de
commit 1a5bf52
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 29 deletions.
diff --git a/source/app/ui/qml/AddBookmark.qml b/source/app/ui/qml/AddBookmark.qml
@@ -84,25 +84,32 @@ Rectangle
 
         RowLayout
         {
-            TextField
+            Item
             {
-                id: nameField
-                width: 150
+                Layout.fillHeight: true
+                Layout.preferredWidth: 192
+                Layout.margins: Constants.margin
+                clip: true
 
-                selectByMouse: true
+                TextInput
+                {
+                    id: nameField
 
-                onAccepted: { doneAction.trigger(); }
+                    anchors.fill: parent
+                    anchors.verticalCenter: parent.verticalCenter
 
-                background: Rectangle
-                {
-                    implicitWidth: 192
-                    color: "transparent"
-                }
+                    selectByMouse: true
+                    color: palette.text
+                    selectionColor: palette.highlight
+                    selectedTextColor: palette.highlightedText
 
-                onFocusChanged:
-                {
-                    if(!focus)
-                        closeAction.trigger();
+                    onAccepted: { doneAction.trigger(); }
+
+                    onFocusChanged:
+                    {
+                        if(!focus)
+                            closeAction.trigger();
+                    }
                 }
             }
 

diff --git a/source/app/ui/qml/Find.qml b/source/app/ui/qml/Find.qml
@@ -390,23 +390,31 @@ Rectangle
             {
                 visible: _type === Find.Simple || _type === Find.Advanced
 
-                TextField
+                Item
                 {
-                    id: findField
-                    width: 150
-                    font.strikeout: root._interrupted
-                    selectByMouse: true
-
-                    onAccepted: { selectAllAction.trigger(); }
+                    Layout.fillHeight: true
+                    Layout.preferredWidth: 192
+                    Layout.margins: Constants.margin
+                    clip: true
 
-                    background: Rectangle
+                    TextInput
                     {
-                        implicitWidth: 192
-                        color: "transparent"
-                    }
+                        id: findField
 
-                    Keys.onUpPressed: { _previousAction.trigger(); }
-                    Keys.onDownPressed: { _nextAction.trigger(); }
+                        anchors.fill: parent
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        font.strikeout: root._interrupted
+                        selectByMouse: true
+                        color: palette.text
+                        selectionColor: palette.highlight
+                        selectedTextColor: palette.highlightedText
+
+                        onAccepted: { selectAllAction.trigger(); }
+
+                        Keys.onUpPressed: { _previousAction.trigger(); }
+                        Keys.onDownPressed: { _nextAction.trigger(); }
+                    }
                 }
 
                 Item

diff --git a/source/app/ui/qml/ManageNamedListDialog.qml b/source/app/ui/qml/ManageNamedListDialog.qml
@@ -89,15 +89,17 @@ Window
                     elide: Text.ElideRight
                 }
 
-                TextField
+                TextInput
                 {
                     id: editField
                     visible: false
                     selectByMouse: true
+                    color: palette.text
+                    selectionColor: palette.highlight
+                    selectedTextColor: palette.highlightedText
 
                     anchors.fill: label
                     padding: 0
-                    background: Item {}
 
                     onAccepted: { finish(); }