Compare commits

..
7 changed files with 87 additions and 153 deletions

View file

@ -47,7 +47,6 @@ M.BarSection {
property M.ProcessList _procs: M.ProcessList {
sortBy: "cpu"
active: root._showPanel
onProcessesChanged: hoverPanel.keepOpen(300)
}
on_AnyHoverChanged: {

View file

@ -31,7 +31,6 @@ PanelWindow {
// Shared
required property color accentColor
property string panelTitle: ""
property string panelNamespace: "nova-panel"
property real contentWidth: 220
@ -50,7 +49,7 @@ PanelWindow {
x: panelContainer.x + panelContainer.width - 28
y: 0
width: 28
height: 24
height: 28
}
WlrLayershell.layer: WlrLayer.Overlay
@ -92,24 +91,6 @@ PanelWindow {
}
}
// Content-change grace: call keepOpen(ms) when panel content is about to
// resize/rebuild (session switch, device list change, etc.) to prevent the
// hover-drop-on-resize from closing the panel.
property bool _contentBusy: false
Timer {
id: _contentBusyTimer
onTriggered: {
root._contentBusy = false;
if (!root.showPanel && !root._grace && !root._pinned)
root._hideTimer.restart();
}
}
function keepOpen(ms) {
_contentBusy = true;
_contentBusyTimer.interval = ms ?? 400;
_contentBusyTimer.restart();
}
function _show() {
_updatePosition();
_winVisible = true;
@ -133,7 +114,7 @@ PanelWindow {
Timer {
id: _hideTimer
interval: 150
onTriggered: if (!root.showPanel && !root._grace && !root._pinned && !root._contentBusy)
onTriggered: if (!root.showPanel && !root._grace && !root._pinned)
root.dismiss()
}
@ -211,7 +192,7 @@ PanelWindow {
x: 0
y: -height
width: root.contentWidth
height: _panelColumn.height
height: panelContent.height
opacity: 0
// Popup mode: eat clicks on panel background so outer dismiss doesn't fire
@ -228,34 +209,18 @@ PanelWindow {
}
Column {
id: _panelColumn
id: panelContent
width: root.contentWidth
// Header row: title (optional) + pin button hover mode only
Item {
visible: !root.popupMode
width: parent.width
height: 24
Text {
visible: root.panelTitle !== ""
anchors.left: parent.left
anchors.leftMargin: 12
anchors.verticalCenter: parent.verticalCenter
text: root.panelTitle
color: root.accentColor
font.pixelSize: M.Theme.fontSize - 1
font.bold: true
font.family: M.Theme.fontFamily
}
// Pin button top-right corner, hover mode only
Item {
visible: root.panelHovered || root._pinned
anchors.right: parent.right
anchors.rightMargin: 4
anchors.verticalCenter: parent.verticalCenter
visible: !root.popupMode && (root.panelHovered || root._pinned)
x: parent.width - width - 4
y: 4
width: 20
height: 20
z: 2
opacity: pinHover.hovered || root._pinned ? 1 : 0.35
Behavior on opacity {
@ -293,13 +258,6 @@ PanelWindow {
}
}
Column {
id: panelContent
width: parent.width
}
}
}
// Border overlay on top of content so full-bleed items don't cover it
Rectangle {
x: panelContainer.x

View file

@ -24,7 +24,6 @@ M.BarSection {
property M.ProcessList _procs: M.ProcessList {
sortBy: "mem"
active: root._showPanel
onProcessesChanged: hoverPanel.keepOpen(300)
}
on_AnyHoverChanged: {

View file

@ -355,21 +355,8 @@ M.BarSection {
}
// Player switcher
Item {
width: parent.width
height: _players.length > 1 ? 28 : 0
visible: _players.length > 1
Flickable {
id: _switcher
anchors.centerIn: parent
width: Math.min(_playerRow.implicitWidth, parent.width - 16)
height: 22
contentWidth: _playerRow.implicitWidth
clip: true
Row {
id: _playerRow
anchors.horizontalCenter: parent.horizontalCenter
height: 22
spacing: 6
@ -406,12 +393,7 @@ M.BarSection {
}
TapHandler {
onTapped: {
root._playerIdx = index;
hoverPanel.keepOpen(400);
}
}
}
onTapped: root._playerIdx = index
}
}
}

View file

@ -98,12 +98,12 @@ M.BarSection {
required property var bar
readonly property bool _anyHover: root._hovered || networkMenu.panelHovered
readonly property bool _anyHover: root._hovered || networkMenu.panelHovered || networkMenu._busy
M.NetworkMenu {
id: networkMenu
showPanel: root._anyHover
screen: QsWindow.window?.screen ?? null
screen: root.bar.screen
anchorItem: root
accentColor: root.accentColor
}

View file

@ -12,6 +12,8 @@ M.HoverPanel {
onVisibleChanged: if (visible)
scanner.running = true
readonly property bool _busy: connectProc.running || disconnectProc.running || radioProc.running
function triggerRefresh() {
if (visible)
scanner.running = true;
@ -83,30 +85,24 @@ M.HoverPanel {
id: radioProc
property string _state: ""
command: ["nmcli", "radio", "wifi", _state]
onRunningChanged: if (!running) {
scanner.running = true;
menuWindow.keepOpen(500);
}
onRunningChanged: if (!running)
scanner.running = true
}
property Process _connectProc: Process {
id: connectProc
property string uuid: ""
command: ["nmcli", "connection", "up", uuid]
onRunningChanged: if (!running) {
scanner.running = true;
menuWindow.keepOpen(500);
}
onRunningChanged: if (!running)
scanner.running = true
}
property Process _disconnectProc: Process {
id: disconnectProc
property string uuid: ""
command: ["nmcli", "connection", "down", uuid]
onRunningChanged: if (!running) {
scanner.running = true;
menuWindow.keepOpen(500);
}
onRunningChanged: if (!running)
scanner.running = true
}
// Wi-Fi radio toggle header

View file

@ -213,7 +213,7 @@ M.BarSection {
verticalAlignment: Text.AlignVCenter
leftPadding: 12
text: "Output Devices"
color: root.accentColor
color: M.Theme.base04
font.pixelSize: M.Theme.fontSize - 1
font.family: M.Theme.fontFamily
}
@ -279,7 +279,7 @@ M.BarSection {
verticalAlignment: Text.AlignVCenter
leftPadding: 12
text: "Applications"
color: root.accentColor
color: M.Theme.base04
font.pixelSize: M.Theme.fontSize - 1
font.family: M.Theme.fontFamily
}