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

popouts: better tray menu focus handling

Browse source 
Don't hide on hover lost, use a focus grab instead
This commit is contained in:
2 * r + 2 * t 2025-07-23 17:21:05 +10:00
parent b09b262f72
commit e104428b28
4 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/bar/popouts/Content.qml
View file

@ -1,6 +1,5 @@
pragma ComponentBehavior: Bound pragma ComponentBehavior: Bound
import qs.services
import qs.config import qs.config
import Quickshell import Quickshell
import Quickshell.Services.SystemTray import Quickshell.Services.SystemTray
@ -10,10 +9,6 @@ Item {
id: root id: root
required property Item wrapper required property Item wrapper
required property ShellScreen screen
required property string currentName
required property real currentCenter
required property bool hasCurrent
anchors.centerIn: parent anchors.centerIn: parent
@ -63,10 +58,10 @@ Item {
sourceComponent: trayMenuComp sourceComponent: trayMenuComp
Connections { Connections {
target: root target: root.wrapper
function onHasCurrentChanged(): void { function onHasCurrentChanged(): void {
if (root.hasCurrent && trayMenu.shouldBeActive) { if (root.wrapper.hasCurrent && trayMenu.shouldBeActive) {
trayMenu.sourceComponent = null; trayMenu.sourceComponent = null;
trayMenu.sourceComponent = trayMenuComp; trayMenu.sourceComponent = trayMenuComp;
} }
@ -77,7 +72,7 @@ Item {
id: trayMenuComp id: trayMenuComp
TrayMenu { TrayMenu {
popouts: root popouts: root.wrapper
trayItem: trayMenu.modelData.menu trayItem: trayMenu.modelData.menu
} }
} }
@ -89,7 +84,7 @@ Item {
id: popout id: popout
required property string name required property string name
property bool shouldBeActive: root.currentName === name property bool shouldBeActive: root.wrapper.currentName === name
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right

7
modules/bar/popouts/TrayMenu.qml
View file

@ -5,6 +5,7 @@ import qs.services
import qs.config import qs.config
import Quickshell import Quickshell
import Quickshell.Widgets import Quickshell.Widgets
import Quickshell.Hyprland
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
@ -26,6 +27,12 @@ StackView {
popEnter: Anim {} popEnter: Anim {}
popExit: Anim {} popExit: Anim {}
HyprlandFocusGrab {
active: true
windows: [QsWindow.window]
onCleared: root.popouts.hasCurrent = false
}
component Anim: Transition { component Anim: Transition {
NumberAnimation { NumberAnimation {
duration: 0 duration: 0

4
modules/bar/popouts/Wrapper.qml
View file

@ -72,10 +72,6 @@ Item {
sourceComponent: Content { sourceComponent: Content {
wrapper: root wrapper: root
screen: root.screen
currentName: root.currentName
currentCenter: root.currentCenter
hasCurrent: root.hasCurrent
} }
} }

15
modules/drawers/Interactions.qml
View file

@ -60,7 +60,8 @@ MouseArea {
if (!utilitiesShortcutActive) if (!utilitiesShortcutActive)
visibilities.utilities = false; visibilities.utilities = false;
popouts.hasCurrent = false; if (!popouts.currentName.startsWith("traymenu"))
popouts.hasCurrent = false;
if (Config.bar.showOnHover) if (Config.bar.showOnHover)
bar.isHovered = false; bar.isHovered = false;
@ -138,16 +139,8 @@ MouseArea {
} }
// Show popouts on hover // Show popouts on hover
const popout = panels.popouts; if (x < bar.implicitWidth)
if (x < bar.implicitWidth + popout.width) { bar.checkPopout(y);
if (x < bar.implicitWidth)
// Handle like part of bar
bar.checkPopout(y);
else
// Keep on hover
popouts.hasCurrent = withinPanelHeight(popout, x, y);
} else
popouts.hasCurrent = false;
} }
// Monitor individual visibility changes // Monitor individual visibility changes