Compare commits

..
2 changed files with 2 additions and 20 deletions

View file

@ -139,26 +139,14 @@ WlSessionLockSurface {
} }
} }
// Keyboard input - focus lives on an Item since WlSessionLockSurface is a window. // Keyboard input - focus lives on an Item since WlSessionLockSurface is a window
// Aggressively reclaim focus: Component.onCompleted may fire before the surface
// is configured, and other items can steal activeFocus during layout.
Item { Item {
id: _keyInput
anchors.fill: parent anchors.fill: parent
focus: true focus: true
Keys.onPressed: event => { Keys.onPressed: event => {
if (!root._unlocking) if (!root._unlocking)
root.auth.handleKey(event); root.auth.handleKey(event);
} }
onActiveFocusChanged: {
if (!activeFocus)
forceActiveFocus();
}
}
onVisibleChanged: {
if (visible)
_keyInput.forceActiveFocus();
} }
// Unlock animation // Unlock animation

View file

@ -5,7 +5,6 @@
quickshell, quickshell,
qt6, qt6,
nova-stats, nova-stats,
glib,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "nova-shell"; pname = "nova-shell";
@ -35,12 +34,7 @@ stdenvNoCC.mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${lib.getExe quickshell} $out/bin/nova-shell \ makeWrapper ${lib.getExe quickshell} $out/bin/nova-shell \
--add-flags "-p $out/share/nova-shell/shell.qml" \ --add-flags "-p $out/share/nova-shell/shell.qml" \
--prefix PATH : ${ --prefix PATH : ${lib.makeBinPath [ nova-stats ]}
lib.makeBinPath [
nova-stats
glib
]
}
runHook postInstall runHook postInstall
''; '';