lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a clear button, and optional icon to NTextInput

Browse Source
This commit is contained in:
Corey Woodworth
2025-10-19 13:06:15 -04:00
parent 2362dca8b6
commit 419cd42b12
7 changed files with 120 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Translations/de.json
+3
View File
@@ -927,6 +927,9 @@
},
"cancel": "Abbrechen",
"apply": "Anwenden"
},
"text-input": {
"clear": "Löschen"
}
},
"bar": {
Assets/Translations/en.json
+3 -1
View File
@@ -910,6 +910,9 @@
},
"cancel": "Cancel",
"apply": "Apply"
},
"text-input": {
"clear": "Clear"
}
},
"bar": {
@@ -1233,7 +1236,6 @@
"scan-again": "Scan again"
}
},
"tooltips": {
"refresh": "Refresh",
"close": "Close",
Assets/Translations/es.json
+3
View File
@@ -903,6 +903,9 @@
},
"cancel": "Cancelar",
"apply": "Aplicar"
},
"text-input": {
"clear": "Borrar"
}
},
"bar": {
Assets/Translations/fr.json
+3
View File
@@ -903,6 +903,9 @@
},
"cancel": "Annuler",
"apply": "Appliquer"
},
"text-input": {
"clear": "Effacer"
}
},
"bar": {
Assets/Translations/pt.json
+3
View File
@@ -903,6 +903,9 @@
},
"cancel": "Cancelar",
"apply": "Aplicar"
},
"text-input": {
"clear": "Limpar"
}
},
"bar": {
Assets/Translations/zh-CN.json
+3
View File
@@ -903,6 +903,9 @@
},
"cancel": "取消",
"apply": "应用"
},
"text-input": {
"clear": "清除"
}
},
"bar": {
Widgets/NTextInput.qml
+102 -51
View File
@@ -9,6 +9,7 @@ ColumnLayout {
property string label: ""
property string description: ""
property string inputIconName: ""
property bool readOnly: false
property bool enabled: true
property color labelColor: Color.mOnSurface
@@ -106,74 +107,124 @@ ColumnLayout {
id: inputContainer
anchors.fill: parent
anchors.leftMargin: Style.marginM
anchors.rightMargin: Style.marginM
// anchors.rightMargin: Style.marginM
clip: true
z: 1
TextField {
id: input
RowLayout {
anchors.fill: parent
verticalAlignment: TextInput.AlignVCenter
echoMode: TextInput.Normal
readOnly: root.readOnly
enabled: root.enabled
color: Color.mOnSurface
placeholderTextColor: Qt.alpha(Color.mOnSurfaceVariant, 0.6)
NIcon {
id: inputIcon
icon: root.inputIconName
selectByMouse: true
visible: root.inputIconName !== ""
enabled: false
topPadding: 0
bottomPadding: 0
leftPadding: 0
rightPadding: 0
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.topMargin: 0
anchors.bottomMargin: 0
anchors.leftMargin: 0
anchors.rightMargin: 0
}
background: null
TextField {
id: input
font.family: root.fontFamily
font.pointSize: root.fontSize * Style.uiScaleRatio
font.weight: root.fontWeight
anchors.left: inputIcon.visible ? inputIcon.right : parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: clearButton.left
anchors.leftMargin: inputIcon.visible ? Style.marginS : 0
onEditingFinished: root.editingFinished()
verticalAlignment: TextInput.AlignVCenter
// Override mouse handling to prevent propagation
MouseArea {
id: textFieldMouse
anchors.fill: parent
acceptedButtons: Qt.AllButtons
preventStealing: true
propagateComposedEvents: false
cursorShape: Qt.IBeamCursor
echoMode: TextInput.Normal
readOnly: root.readOnly
enabled: root.enabled
color: Color.mOnSurface
placeholderTextColor: Qt.alpha(Color.mOnSurfaceVariant, 0.6)
property int selectionStart: 0
selectByMouse: true
onPressed: mouse => {
mouse.accepted = true
input.forceActiveFocus()
var pos = input.positionAt(mouse.x, mouse.y)
input.cursorPosition = pos
selectionStart = pos
}
topPadding: 0
bottomPadding: 0
leftPadding: 0
rightPadding: 0
onPositionChanged: mouse => {
if (mouse.buttons & Qt.LeftButton) {
mouse.accepted = true
var pos = input.positionAt(mouse.x, mouse.y)
input.select(selectionStart, pos)
}
}
background: null
onDoubleClicked: mouse => {
mouse.accepted = true
input.selectAll()
}
font.family: root.fontFamily
font.pointSize: root.fontSize * Style.uiScaleRatio
font.weight: root.fontWeight
onReleased: mouse => {
onEditingFinished: root.editingFinished()
// Override mouse handling to prevent propagation
MouseArea {
id: textFieldMouse
anchors.fill: parent
acceptedButtons: Qt.AllButtons
preventStealing: true
propagateComposedEvents: false
cursorShape: Qt.IBeamCursor
property int selectionStart: 0
onPressed: mouse => {
mouse.accepted = true
input.forceActiveFocus()
var pos = input.positionAt(mouse.x, mouse.y)
input.cursorPosition = pos
selectionStart = pos
}
onWheel: wheel => {
wheel.accepted = true
}
onPositionChanged: mouse => {
if (mouse.buttons & Qt.LeftButton) {
mouse.accepted = true
var pos = input.positionAt(mouse.x, mouse.y)
input.select(selectionStart, pos)
}
}
onDoubleClicked: mouse => {
mouse.accepted = true
input.selectAll()
}
onReleased: mouse => {
mouse.accepted = true
}
onWheel: wheel => {
wheel.accepted = true
}
}
}
NIconButton {
id: clearButton
icon: "x"
tooltipText: I18n.tr("widgets.text-input.clear")
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.topMargin: 0
anchors.bottomMargin: 0
anchors.leftMargin: 0
anchors.rightMargin: 0
border.width: 0
colorBg: Color.transparent
colorBgHover: Color.transparent
colorFgHover: Color.mTertiary
visible: input.text.length > 0 && !root.readOnly
enabled: input.text.length > 0 && !root.readOnly
onClicked: {
input.clear()
input.forceActiveFocus()
}
}
}
}