зеркало из https://github.com/nextcloud/desktop.git
Fix height of text input fields and radius.
Signed-off-by: Camila Ayres <hello@camilasan.com>
This commit is contained in:
Родитель
228e561d66
Коммит
1354b63153
|
@ -22,7 +22,7 @@ import Style
|
|||
TextEdit {
|
||||
id: root
|
||||
|
||||
readonly property color accentColor: Style.ncBlue
|
||||
readonly property color accentColor: palette.highlight
|
||||
readonly property color secondaryColor: palette.dark
|
||||
readonly property alias submitButton: submitButton
|
||||
|
||||
|
@ -33,6 +33,16 @@ TextEdit {
|
|||
selectByMouse: true
|
||||
height: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
|
||||
|
||||
Rectangle {
|
||||
id: textFieldBorder
|
||||
anchors.fill: parent
|
||||
radius: Style.trayWindowRadius
|
||||
border.width: Style.normalBorderWidth
|
||||
border.color: root.activeFocus ? root.accentColor : root.secondaryColor
|
||||
color: palette.window
|
||||
z: -1
|
||||
}
|
||||
|
||||
Button {
|
||||
id: submitButton
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ TextField {
|
|||
readonly property alias submitButton: submitButton
|
||||
property bool validInput: true
|
||||
|
||||
implicitHeight: Style.talkReplyTextFieldPreferredHeight
|
||||
implicitHeight: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
|
||||
|
||||
rightPadding: submitButton.width
|
||||
|
||||
|
@ -52,5 +52,12 @@ TextField {
|
|||
|
||||
onClicked: root.accepted()
|
||||
}
|
||||
|
||||
verticalAlignment: Qt.AlignVCenter
|
||||
background: Rectangle {
|
||||
border.color: palette.dark
|
||||
radius: Style.trayWindowRadius
|
||||
color: palette.window
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,6 +47,14 @@ TextField {
|
|||
|
||||
placeholderText: enabled ? qsTr("Search for users or groups…") : qsTr("Sharing is not available for this folder")
|
||||
placeholderTextColor: placeholderColor
|
||||
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()
|
||||
|
|
Загрузка…
Ссылка в новой задаче