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

drawers: dont use hyprland cursor pos

Browse source 
Use mousearea with positionChanged and containsMouse
This commit is contained in:
2 * r + 2 * t 2025-05-27 10:01:33 +08:00
parent c2ee9a52bd
commit 7d1ee06807
3 changed files with 27 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/drawers/Drawers.qml
View file

@ -116,6 +116,7 @@ Variants {
Interactions {
screen: scope.modelData
visibilities: visibilities
panels: panels
Panels {
id: panels

54
modules/drawers/Interactions.qml
View file

@ -9,6 +9,7 @@ MouseArea {
required property ShellScreen screen
required property PersistentProperties visibilities
required property Panels panels
property bool osdHovered
property point dragStart
@ -31,37 +32,34 @@ MouseArea {
hoverEnabled: true
onPressed: event => dragStart = Qt.point(event.x, event.y)
Connections {
target: Hyprland
function onCursorPosChanged(): void {
let {
x,
y
} = Hyprland.cursorPos;
x -= QsWindow.window.margins.left + Hyprland.focusedMonitor.x;
y -= QsWindow.window.margins.top + Hyprland.focusedMonitor.y;
// Show osd on hover
const showOsd = root.inRightPanel(panels.osd, x, y);
root.visibilities.osd = showOsd;
root.osdHovered = showOsd;
// Show/hide session on drag
if (root.pressed && root.withinPanelHeight(panels.session, x, y)) {
const dragX = x - root.dragStart.x;
if (dragX < -SessionConfig.dragThreshold)
root.visibilities.session = true;
else if (dragX > SessionConfig.dragThreshold)
root.visibilities.session = false;
}
const showDashboard = root.inTopPanel(panels.dashboard, x, y);
root.visibilities.dashboard = showDashboard;
onContainsMouseChanged: {
if (!containsMouse) {
visibilities.osd = false;
osdHovered = false;
visibilities.dashboard = false;
}
}
onPositionChanged: ({x, y}) => {
// Show osd on hover
const showOsd = inRightPanel(panels.osd, x, y);
visibilities.osd = showOsd;
osdHovered = showOsd;
// Show/hide session on drag
if (pressed && withinPanelHeight(panels.session, x, y)) {
const dragX = x - dragStart.x;
if (dragX < -SessionConfig.dragThreshold)
visibilities.session = true;
else if (dragX > SessionConfig.dragThreshold)
visibilities.session = false;
}
// Show dashboard on hover
const showDashboard = root.inTopPanel(panels.dashboard, x, y);
visibilities.dashboard = showDashboard;
}
Osd.Interactions {
screen: root.screen
visibilities: root.visibilities

13
services/Hyprland.qml
View file

@ -39,19 +39,6 @@ Singleton {
}
}
FrameAnimation {
running: true
onTriggered: getCursorPos.running = true
}
Process {
id: getCursorPos
command: ["hyprctl", "cursorpos"]
stdout: SplitParser {
onRead: data => root.cursorPos = data
}
}
Process {
id: getClients
command: ["sh", "-c", "hyprctl -j clients | jq -c"]