Merge branch 'dev' of github.com:noctalia-dev/noctalia-shell into dev
This commit is contained in:
commit
ba69ccbf82
5 changed files with 72 additions and 179 deletions
|
|
@ -550,9 +550,8 @@ WlSessionLock {
|
|||
height: 20 * scaling
|
||||
color: Color.mPrimary
|
||||
visible: passwordInput.activeFocus
|
||||
anchors.left: asterisksText.right
|
||||
anchors.leftMargin: Style.marginTiniest * scaling
|
||||
anchors.verticalCenter: asterisksText.verticalCenter
|
||||
Layout.leftMargin: asterisksText.width + Style.marginTiniest * scaling
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
|
||||
SequentialAnimation on opacity {
|
||||
loops: Animation.Infinite
|
||||
|
|
@ -618,7 +617,7 @@ WlSessionLock {
|
|||
onClicked: lock.unlockAttempt()
|
||||
|
||||
SequentialAnimation on scale {
|
||||
running: containsMouse
|
||||
running: executeButtonArea.containsMouse
|
||||
NumberAnimation {
|
||||
to: 1.05
|
||||
duration: Style.animationFast
|
||||
|
|
@ -627,7 +626,7 @@ WlSessionLock {
|
|||
}
|
||||
|
||||
SequentialAnimation on scale {
|
||||
running: !containsMouse
|
||||
running: !executeButtonArea.containsMouse
|
||||
NumberAnimation {
|
||||
to: 1.0
|
||||
duration: Style.animationFast
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue