diff --git a/qt6/src/qml/FlowStyle.qml b/qt6/src/qml/FlowStyle.qml index 5d3cbeb4..35021e07 100644 --- a/qt6/src/qml/FlowStyle.qml +++ b/qt6/src/qml/FlowStyle.qml @@ -667,6 +667,9 @@ QtObject { property QtObject passwordEdit: QtObject { property int echoActionSpacing: 8 + property int dotSize: 6 + property int dotSpacing: 5 + property int dotLeftMargin: 8 } property QtObject keySequenceEdit: QtObject { diff --git a/qt6/src/qml/PasswordEdit.qml b/qt6/src/qml/PasswordEdit.qml index 990d4837..7e6a69a5 100644 --- a/qt6/src/qml/PasswordEdit.qml +++ b/qt6/src/qml/PasswordEdit.qml @@ -22,9 +22,27 @@ LineEdit { } echoMode: TextInput.Password + + font.family: control.isEchoMode ? D.DTK.fontManager.t6.family : "Noto Mono" + font.pixelSize: D.DTK.fontManager.t6.pixelSize + font.letterSpacing: control.isEchoMode ? 0 + : control._dotAdvance - passwordDotMetrics.advanceWidth + + leftPadding: DS.Style.passwordEdit.dotLeftMargin + clearButton.anchors.rightMargin: echoButton.visible ? DS.Style.passwordEdit.echoActionSpacing + echoButton.width : 0 + readonly property int _dotAdvance: DS.Style.passwordEdit.dotSize + + DS.Style.passwordEdit.dotSpacing + + TextMetrics { + id: passwordDotMetrics + text: control.passwordCharacter + font.family: "Noto Mono" + font.pixelSize: D.DTK.fontManager.t6.pixelSize + } + ActionButton { id: echoButton