Commit cd46f752 authored by Filip Fila's avatar Filip Fila 🌆

Merge branch 'Plasma/5.18'

parents 6f103ebd 68601675
......@@ -14,6 +14,7 @@ Name[fi]=Taustakuvaliitännäiset
Name[fr]=Modules externes de fonds d'écran
Name[gl]=Complementos de fondo de escritorio
Name[hu]=Háttérképmodulok
Name[ia]=Plugind de tapete de papiro
Name[id]=Plugin-plugin Wallpaper
Name[it]=Estensioni per lo sfondo
Name[ko]=배경 그림 플러그인
......
......@@ -23,6 +23,7 @@ Name[fi]=Käyttäjäpalaute
Name[fr]=Retours des utilisateurs
Name[gl]=Achegas de usuario
Name[hu]=Felhasználói visszajelzés
Name[ia]=Responsa del usator
Name[id]=Tanggapan Pengguna
Name[it]=Segnalazioni dell'utente
Name[ja]=ユーザ フィードバック
......
......@@ -411,26 +411,6 @@ PlasmaCore.ColorScope {
}
}
Image {
id: logo
visible: config.showlogo == "shown"
source: config.logo
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: footer.top
anchors.bottomMargin: units.largeSpacing
asynchronous: true
sourceSize.height: height
opacity: loginScreenRoot.uiVisible ? 0 : 1
fillMode: Image.PreserveAspectFit
height: Math.round(units.gridUnit * 3.5)
Behavior on opacity {
OpacityAnimator {
duration: units.longDuration
easing.type: Easing.InOutQuad
}
}
}
DropShadow {
id: logoShadow
anchors.fill: logo
......@@ -444,7 +424,29 @@ PlasmaCore.ColorScope {
color: "black" // matches Breeze window decoration and desktopcontainment
opacity: loginScreenRoot.uiVisible ? 0 : 1
Behavior on opacity {
OpacityAnimator {
//OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
NumberAnimation {
duration: units.longDuration
easing.type: Easing.InOutQuad
}
}
}
Image {
id: logo
visible: config.showlogo == "shown"
source: config.logo
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: footer.top
anchors.bottomMargin: units.largeSpacing
asynchronous: true
sourceSize.height: height
opacity: loginScreenRoot.uiVisible ? 0 : 1
fillMode: Image.PreserveAspectFit
height: Math.round(units.gridUnit * 3.5)
Behavior on opacity {
// OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
NumberAnimation {
duration: units.longDuration
easing.type: Easing.InOutQuad
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment