nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lock: show status on small screens

Browse source 
Hide notifs but show status
This commit is contained in:
2 * r + 2 * t 2025-07-22 16:12:21 +10:00
parent b3e9bcfc2d
commit 0b520dc28b
2 changed files with 99 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/lock/LockSurface.qml
View file

@ -69,8 +69,8 @@ WlSessionLockSurface {
weatherWidth: weather.implicitWidth weatherWidth: weather.implicitWidth
buttonsWidth: buttons.item?.nonAnimWidth ?? 0 buttonsWidth: buttons.item?.nonAnimWidth ?? 0
buttonsHeight: buttons.item?.nonAnimHeight ?? 0 buttonsHeight: buttons.item?.nonAnimHeight ?? 0
statusWidth: status.item?.nonAnimWidth ?? 0 statusWidth: status.nonAnimWidth ?? 0
statusHeight: status.item?.nonAnimHeight ?? 0 statusHeight: status.nonAnimHeight ?? 0
isNormal: root.screen.width > Config.lock.sizes.smallScreenWidth isNormal: root.screen.width > Config.lock.sizes.smallScreenWidth
isLarge: root.screen.width > Config.lock.sizes.largeScreenWidth isLarge: root.screen.width > Config.lock.sizes.largeScreenWidth
@ -162,17 +162,15 @@ WlSessionLockSurface {
sourceComponent: Buttons {} sourceComponent: Buttons {}
} }
Loader { Status {
id: status id: status
active: root.screen.width > Config.lock.sizes.largeScreenWidth
anchors.bottom: parent.top anchors.bottom: parent.top
anchors.left: parent.right anchors.left: parent.right
anchors.bottomMargin: -backgrounds.statusBottom anchors.bottomMargin: -backgrounds.statusBottom
anchors.leftMargin: -backgrounds.statusLeft anchors.leftMargin: -backgrounds.statusLeft
sourceComponent: Status {} showNotifs: root.screen.width > Config.lock.sizes.largeScreenWidth
} }
component Anim: NumberAnimation { component Anim: NumberAnimation {

16
modules/lock/Status.qml
View file

@ -10,13 +10,15 @@ import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
WrapperItem { WrapperItem {
readonly property real nonAnimWidth: (notifs.count > 0 ? Config.notifs.sizes.width : status.implicitWidth) + margin property alias showNotifs: notifs.active
readonly property real nonAnimWidth: (notifs.item?.count > 0 ? Config.notifs.sizes.width : status.implicitWidth) + margin
readonly property real nonAnimHeight: { readonly property real nonAnimHeight: {
if (notifs.count > 0) { if (notifs.active && notifs.item.count > 0) {
const count = Math.min(notifs.count, Config.lock.maxNotifs); const count = Math.min(notifs.item.count, Config.lock.maxNotifs);
let height = status.implicitHeight + Appearance.spacing.normal + Appearance.spacing.smaller * (count - 1); let height = status.implicitHeight + Appearance.spacing.normal + Appearance.spacing.smaller * (count - 1);
for (let i = 0; i < count; i++) for (let i = 0; i < count; i++)
height += notifs.itemAtIndex(i)?.nonAnimHeight ?? 0; height += notifs.item.itemAtIndex(i)?.nonAnimHeight ?? 0;
return height + margin; return height + margin;
} }
@ -33,7 +35,7 @@ WrapperItem {
Timer { Timer {
running: true running: true
interval: 10 interval: 10
onTriggered: notifs.countChanged() onTriggered: notifs.item?.countChanged()
} }
Behavior on implicitWidth { Behavior on implicitWidth {
@ -118,12 +120,13 @@ WrapperItem {
} }
} }
ListView { Loader {
id: notifs id: notifs
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
sourceComponent: ListView {
model: ScriptModel { model: ScriptModel {
values: [...Notifs.list].reverse() values: [...Notifs.list].reverse()
} }
@ -227,6 +230,7 @@ WrapperItem {
} }
} }
} }
}
component Anim: NumberAnimation { component Anim: NumberAnimation {
duration: Appearance.anim.durations.normal duration: Appearance.anim.durations.normal