Skip to content

Commit

Permalink
Merge pull request #7508 from nextcloud/backport/7374/stable-3.14
Browse files Browse the repository at this point in the history
[stable-3.14] Fix QML errors caused by illegal customisation of text field backgrounds on native styles
  • Loading branch information
claucambra authored Nov 18, 2024
2 parents 1df1444 + bda27f7 commit ab4630f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
5 changes: 0 additions & 5 deletions src/gui/filedetails/NCInputTextField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,5 @@ TextField {
}

verticalAlignment: Qt.AlignVCenter
background: Rectangle {
border.color: palette.dark
radius: Style.trayWindowRadius
color: palette.window
}
}

1 change: 1 addition & 0 deletions src/gui/filedetails/ShareView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ ColumnLayout {
ShareeSearchField {
id: shareeSearchField
Layout.fillWidth: true
Layout.topMargin: Style.smallSpacing
Layout.leftMargin: root.horizontalPadding
Layout.rightMargin: root.horizontalPadding

Expand Down
6 changes: 0 additions & 6 deletions src/gui/filedetails/ShareeSearchField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down

0 comments on commit ab4630f

Please sign in to comment.