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

popouts/tray: better interaction

Browse source 
Not exclusive when on first layer of submenus

Closes #610
This commit is contained in:
2 * r + 2 * t 2025-09-13 11:25:11 +10:00
parent 7e93d558d6
commit a57dd9343a
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,11 +10,13 @@ Item {
id: root id: root
required property Item wrapper required property Item wrapper
readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
readonly property Item current: currentPopout?.item ?? null
anchors.centerIn: parent anchors.centerIn: parent
implicitWidth: (content.children.find(c => c.shouldBeActive)?.implicitWidth ?? 0) + Appearance.padding.large * 2 implicitWidth: (currentPopout?.implicitWidth ?? 0) + Appearance.padding.large * 2
implicitHeight: (content.children.find(c => c.shouldBeActive)?.implicitHeight ?? 0) + Appearance.padding.large * 2 implicitHeight: (currentPopout?.implicitHeight ?? 0) + Appearance.padding.large * 2
Item { Item {
id: content id: content

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

@ -28,7 +28,7 @@ StackView {
popExit: NoAnim {} popExit: NoAnim {}
HyprlandFocusGrab { HyprlandFocusGrab {
active: true active: root.depth > 1
windows: [QsWindow.window] windows: [QsWindow.window]
onCleared: root.popouts.hasCurrent = false onCleared: root.popouts.hasCurrent = false
} }

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

@ -17,6 +17,7 @@ Item {
readonly property real nonAnimWidth: x > 0 || hasCurrent ? children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth : 0 readonly property real nonAnimWidth: x > 0 || hasCurrent ? children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth : 0
readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight
readonly property Item current: content.item?.current ?? null
property string currentName property string currentName
property real currentCenter property real currentCenter

2
modules/drawers/Interactions.qml
View file

@ -73,7 +73,7 @@ CustomMouseArea {
if (!utilitiesShortcutActive) if (!utilitiesShortcutActive)
visibilities.utilities = false; visibilities.utilities = false;
if (!popouts.currentName.startsWith("traymenu")) if (!popouts.currentName.startsWith("traymenu") || popouts.current.depth <= 1)
popouts.hasCurrent = false; popouts.hasCurrent = false;
if (Config.bar.showOnHover) if (Config.bar.showOnHover)