diff --git a/nix/hm-module.nix b/nix/hm-module.nix index c39cc54..c706f45 100644 --- a/nix/hm-module.nix +++ b/nix/hm-module.nix @@ -253,8 +253,7 @@ in description = '' Theme overrides written to `$XDG_CONFIG_HOME/nova-shell/theme.json`. Keys: colors (base00-base0F), fontFamily, iconFontFamily, fontSize, - barOpacity, barHeight, barPadding, groupSpacing, groupPadding, moduleSpacing, - radius, screenRadius, reducedMotion. + barOpacity, barHeight, barPadding, groupSpacing, groupPadding, moduleSpacing, radius, screenRadius. Automatically populated from stylix when it is available. ''; }; diff --git a/shell/applets/BluetoothApplet.qml b/shell/applets/BluetoothApplet.qml index 89ff63b..1f7eeb4 100644 --- a/shell/applets/BluetoothApplet.qml +++ b/shell/applets/BluetoothApplet.qml @@ -57,7 +57,7 @@ Column { // Pulse animation while pending SequentialAnimation on opacity { loops: Animation.Infinite - running: entry._pending && !S.Theme.reducedMotion + running: entry._pending NumberAnimation { to: 0.5 duration: 400 diff --git a/shell/lock/LockSurface.qml b/shell/lock/LockSurface.qml index 91c8140..27f14f9 100644 --- a/shell/lock/LockSurface.qml +++ b/shell/lock/LockSurface.qml @@ -371,7 +371,7 @@ WlSessionLockSurface { SequentialAnimation { id: _heartbeatAnim loops: Animation.Infinite - running: root._threatEnabled && root.auth.failCount >= 3 && root.lock.secure && !S.Theme.reducedMotion + running: root._threatEnabled && root.auth.failCount >= 3 && root.lock.secure // Systole (sharp spike) NumberAnimation { diff --git a/shell/modules/BarGroup.qml b/shell/modules/BarGroup.qml index 5cbbe6e..912c94f 100644 --- a/shell/modules/BarGroup.qml +++ b/shell/modules/BarGroup.qml @@ -125,7 +125,7 @@ Item { property real _pulse: 0.08 SequentialAnimation on _pulse { - running: root._hovered && !S.Theme.reducedMotion + running: root._hovered loops: Animation.Infinite NumberAnimation { to: 0.22 diff --git a/shell/modules/HoverPanel.qml b/shell/modules/HoverPanel.qml index ab17583..7585fa9 100644 --- a/shell/modules/HoverPanel.qml +++ b/shell/modules/HoverPanel.qml @@ -133,12 +133,7 @@ PanelWindow { } _winVisible = true; hideAnim.stop(); - if (S.Theme.reducedMotion) { - panelContainer.opacity = 1; - panelContainer.y = 0; - } else { - showAnim.start(); - } + showAnim.start(); _grace = true; _graceTimer.restart(); } @@ -146,13 +141,7 @@ PanelWindow { function dismiss() { _pinned = false; showAnim.stop(); - if (S.Theme.reducedMotion) { - _winVisible = false; - if (popupMode) - dismissed(); - } else { - hideAnim.start(); - } + hideAnim.start(); _grace = false; _graceTimer.stop(); } diff --git a/shell/modules/NotifPopup.qml b/shell/modules/NotifPopup.qml index 41ad6d8..25ba8fd 100644 --- a/shell/modules/NotifPopup.qml +++ b/shell/modules/NotifPopup.qml @@ -68,13 +68,7 @@ PanelWindow { _heightScale = 1; } else { popupCol._knownIds[modelData.id] = true; - if (S.Theme.reducedMotion) { - opacity = 1; - x = 0; - _heightScale = 1; - } else { - slideIn.start(); - } + slideIn.start(); } _entered = true; } @@ -88,7 +82,7 @@ PanelWindow { } Behavior on y { - enabled: popupItem._entered && !S.Theme.reducedMotion + enabled: popupItem._entered NumberAnimation { duration: 200 easing.type: Easing.OutCubic @@ -129,11 +123,7 @@ PanelWindow { popupItem.modelData.beginDismiss(); _fullDismiss = !!full; slideIn.stop(); - if (S.Theme.reducedMotion) { - full ? S.NotifService.dismiss(modelData.id) : S.NotifService.dismissPopup(modelData.id); - } else { - slideOut.start(); - } + slideOut.start(); } SequentialAnimation { diff --git a/shell/modules/NotificationsModule.qml b/shell/modules/NotificationsModule.qml index 044dc41..1af6743 100644 --- a/shell/modules/NotificationsModule.qml +++ b/shell/modules/NotificationsModule.qml @@ -63,7 +63,7 @@ M.PinnableSection { Connections { target: S.NotifService function onCountChanged() { - if (S.NotifService.count > 0 && !S.Theme.reducedMotion) + if (S.NotifService.count > 0) popAnim.start(); } } diff --git a/shell/modules/PulseAnimation.qml b/shell/modules/PulseAnimation.qml index 555a258..a0270e8 100644 --- a/shell/modules/PulseAnimation.qml +++ b/shell/modules/PulseAnimation.qml @@ -1,9 +1,8 @@ import QtQuick -import "../services" as S SequentialAnimation { id: root - loops: S.Theme.reducedMotion ? 1 : Animation.Infinite + loops: Animation.Infinite property real minOpacity: 0.4 property int halfDuration: 400 diff --git a/shell/modules/Tooltip.qml b/shell/modules/Tooltip.qml index d8aa5be..7424211 100644 --- a/shell/modules/Tooltip.qml +++ b/shell/modules/Tooltip.qml @@ -19,19 +19,10 @@ PanelWindow { if (_shown) { _winVisible = true; hideAnim.stop(); - if (S.Theme.reducedMotion) { - content.opacity = 1; - content.y = 0; - } else { - showAnim.start(); - } + showAnim.start(); } else { showAnim.stop(); - if (S.Theme.reducedMotion) { - _winVisible = false; - } else { - hideAnim.start(); - } + hideAnim.start(); } } diff --git a/shell/modules/TrayModule.qml b/shell/modules/TrayModule.qml index 3f4fa81..a8ed98f 100644 --- a/shell/modules/TrayModule.qml +++ b/shell/modules/TrayModule.qml @@ -10,7 +10,7 @@ import "../services" as S RowLayout { id: root spacing: S.Theme.moduleSpacing + 2 - visible: S.Modules.tray.enable && SystemTray.items.count > 0 + visible: S.Modules.tray.enable && SystemTray.items.length > 0 required property var bar property var _activeMenu: null diff --git a/test/qmllint-baseline.txt b/test/qmllint-baseline.txt index 06ceb4d..a5112d2 100644 --- a/test/qmllint-baseline.txt +++ b/test/qmllint-baseline.txt @@ -70,7 +70,7 @@ shell/modules/Tooltip.qml: Type PanelWindow is not creatable. [uncreatable-type] shell/modules/Tooltip.qml: Type margins is used but it is not resolved [unresolved-type] shell/modules/Tooltip.qml: unknown grouped property scope margins. [unqualified] shell/modules/TrayMenu.qml: Unqualified access [unqualified] -shell/modules/TrayModule.qml: Member "count" not found on type "UntypedObjectModel" [missing-property] +shell/modules/TrayModule.qml: Member "length" not found on type "UntypedObjectModel" [missing-property] shell/modules/TrayModule.qml: Member "screen" not found on type "QObject" [missing-property] shell/modules/TrayModule.qml: Type "qs::dbus::dbusmenu::DBusMenuHandle" of property "menu" not found. This is likely due to a missing dependency entry or a type not being exposed declaratively. [unresolved-type] shell/modules/TrayModule.qml: Unqualified access [unqualified]