Merge pull request #7508 from nextcloud/backport/7374/stable-3.14

claucambra · web-flow · commit ab4630f77283 · 2024-11-18T17:03:49.000+08:00
[stable-3.14] Fix QML errors caused by illegal customisation of text field backgrounds on native styles
diff --git a/src/gui/filedetails/NCInputTextField.qml b/src/gui/filedetails/NCInputTextField.qml
@@ -54,10 +54,5 @@ TextField {
     }
 
     verticalAlignment: Qt.AlignVCenter
-    background: Rectangle {
-        border.color: palette.dark
-        radius: Style.trayWindowRadius
-        color: palette.window
-    }
 }
 
diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml
@@ -142,6 +142,7 @@ ColumnLayout {
     ShareeSearchField {
         id: shareeSearchField
         Layout.fillWidth: true
+        Layout.topMargin: Style.smallSpacing
         Layout.leftMargin: root.horizontalPadding
         Layout.rightMargin: root.horizontalPadding
 
diff --git a/src/gui/filedetails/ShareeSearchField.qml b/src/gui/filedetails/ShareeSearchField.qml
@@ -50,12 +50,6 @@ TextField {
     verticalAlignment: Qt.AlignVCenter
     implicitHeight: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
 
-    background: Rectangle {
-        border.color: palette.dark
-        radius: Style.trayWindowRadius
-        color: palette.window
-    }
-
     onActiveFocusChanged: triggerSuggestionsVisibility()
     onTextChanged: triggerSuggestionsVisibility()
     Keys.onPressed: {

Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,5 @@ TextField {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`verticalAlignment: Qt.AlignVCenter`
`57`		`- background: Rectangle {`
`58`		`- border.color: palette.dark`
`59`		`- radius: Style.trayWindowRadius`
`60`		`- color: palette.window`
`61`		`- }`
`62`	`57`	`}`
`63`	`58`