git.iko.soy/unity8
on xenial help sign in
Merge from passphrase-ui-tweaks
0fc2b58Michael Terry
qml/Components/PassphraseLockscreen.qml+23
compare with xenial
unifiedsplit
@@ -91,6 +91,11 @@ Item {
91 }
91 }
92 clip: true
92 clip: true
93
93
94+ // This is so that we can draw our own dots, for we want
95+ // complete control over the pixel sizes. (The ubuntu font
96+ // has oddly sized password characters that don't scale right)
97+ opacity: 0
98+
94 // simulate being disabled, but without removing OSK focus
99 // simulate being disabled, but without removing OSK focus
95 maximumLength: root.entryEnabled ? 32767 : length
100 maximumLength: root.entryEnabled ? 32767 : length
96
101
@@ -103,6 +108,24 @@ Item {
103 }
108 }
104 }
109 }
105
110
111+ Row {
112+ id: dotRow
113+ anchors.centerIn: entryContainer
114+
115+ property real dotSize: Math.min(units.gu(2), entryContainer.width / pinentryField.length)
116+ spacing: Math.min(units.gu(2), Math.max(0, (entryContainer.width / pinentryField.length) - dotSize))
117+
118+ Repeater {
119+ model: pinentryField.length
120+ delegate: Rectangle {
121+ color: "#f3f3e7"
122+ width: dotRow.dotSize
123+ height: width
124+ radius: width / 2
125+ }
126+ }
127+ }
128+
106 Label {
129 Label {
107 id: wrongNoticeLabel
130 id: wrongNoticeLabel
108 objectName: "wrongNoticeLabel"
131 objectName: "wrongNoticeLabel"