osd
This commit is contained in:
Zacharias-Brohn
+11
-1
@@ -6,6 +6,7 @@ import qs.Modules.Notifications as Notifications
|
||||
import qs.Modules.Notifications.Sidebar as Sidebar
|
||||
import qs.Modules.Notifications.Sidebar.Utils as Utils
|
||||
import qs.Modules.Dashboard as Dashboard
|
||||
import qs.Modules.Osd as Osd
|
||||
|
||||
Shape {
|
||||
id: root
|
||||
@@ -16,9 +17,18 @@ Shape {
|
||||
|
||||
anchors.fill: parent
|
||||
// anchors.margins: 8
|
||||
anchors.topMargin: !root.visibilities.bar ? 4 : bar.implicitHeight
|
||||
anchors.topMargin: bar.implicitHeight
|
||||
preferredRendererType: Shape.CurveRenderer
|
||||
|
||||
Component.onCompleted: console.log(root.bar.implicitHeight, root.bar.anchors.topMargin)
|
||||
|
||||
Osd.Background {
|
||||
wrapper: root.panels.osd
|
||||
|
||||
startX: root.width - root.panels.sidebar.width
|
||||
startY: ( root.height - wrapper.height ) / 2 - rounding
|
||||
}
|
||||
|
||||
Modules.Background {
|
||||
wrapper: root.panels.popouts
|
||||
invertBottomRounding: wrapper.x <= 0
|
||||
|
||||
@@ -0,0 +1,273 @@
|
||||
import Quickshell
|
||||
import QtQuick
|
||||
import qs.Components
|
||||
import qs.Config
|
||||
import qs.Modules as BarPopouts
|
||||
|
||||
CustomMouseArea {
|
||||
id: root
|
||||
|
||||
required property ShellScreen screen
|
||||
required property BarPopouts.Wrapper popouts
|
||||
required property PersistentProperties visibilities
|
||||
required property Panels panels
|
||||
required property Item bar
|
||||
|
||||
property point dragStart
|
||||
property bool dashboardShortcutActive
|
||||
property bool osdShortcutActive
|
||||
property bool utilitiesShortcutActive
|
||||
|
||||
function withinPanelHeight(panel: Item, x: real, y: real): bool {
|
||||
const panelY = panel.y + bar.implicitHeight;
|
||||
return y >= panelY && y <= panelY + panel.height;
|
||||
}
|
||||
|
||||
function withinPanelWidth(panel: Item, x: real, y: real): bool {
|
||||
const panelX = panel.x;
|
||||
return x >= panelX && x <= panelX + panel.width;
|
||||
}
|
||||
|
||||
function inLeftPanel(panel: Item, x: real, y: real): bool {
|
||||
return x < panel.x + panel.width && withinPanelHeight(panel, x, y);
|
||||
}
|
||||
|
||||
function inRightPanel(panel: Item, x: real, y: real): bool {
|
||||
return x > panel.x && withinPanelHeight(panel, x, y);
|
||||
}
|
||||
|
||||
function inTopPanel(panel: Item, x: real, y: real): bool {
|
||||
return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
|
||||
}
|
||||
|
||||
function inBottomPanel(panel: Item, x: real, y: real): bool {
|
||||
return y > root.height - panel.height && withinPanelWidth(panel, x, y);
|
||||
}
|
||||
|
||||
function onWheel(event: WheelEvent): void {
|
||||
if (event.x < bar.implicitWidth) {
|
||||
bar.handleWheel(event.y, event.angleDelta);
|
||||
}
|
||||
}
|
||||
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
|
||||
onPressed: event => {
|
||||
if ( root.popouts.hasCurrent && !inTopPanel( root.popouts, event.x, event.y )) {
|
||||
root.popouts.hasCurrent = false;
|
||||
} else if (root.visibilities.sidebar && !inRightPanel( panels.sidebar, event.x, event.y )) {
|
||||
root.visibilities.sidebar = false;
|
||||
} else if (root.visibilities.dashboard && !inTopPanel( panels.dashboard, event.x, event.y )) {
|
||||
root.visibilities.dashboard = false;
|
||||
}
|
||||
}
|
||||
|
||||
onContainsMouseChanged: {
|
||||
if (!containsMouse) {
|
||||
// Only hide if not activated by shortcut
|
||||
if (!osdShortcutActive) {
|
||||
visibilities.osd = false;
|
||||
root.panels.osd.hovered = false;
|
||||
}
|
||||
|
||||
if (!dashboardShortcutActive)
|
||||
visibilities.dashboard = false;
|
||||
|
||||
// if (!utilitiesShortcutActive)
|
||||
// visibilities.utilities = false;
|
||||
|
||||
if (!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1) {
|
||||
popouts.hasCurrent = false;
|
||||
// bar.closeTray();
|
||||
}
|
||||
|
||||
if (Config.autoHide)
|
||||
root.visibilities.bar = false;
|
||||
}
|
||||
}
|
||||
|
||||
onPositionChanged: event => {
|
||||
if (popouts.isDetached)
|
||||
return;
|
||||
|
||||
const x = event.x;
|
||||
const y = event.y;
|
||||
const dragX = x - dragStart.x;
|
||||
const dragY = y - dragStart.y;
|
||||
|
||||
// Show bar in non-exclusive mode on hover
|
||||
if (!visibilities.bar && Config.autoHide && y < bar.implicitHeight + bar.anchors.topMargin)
|
||||
visibilities.bar = true;
|
||||
|
||||
if (panels.sidebar.width === 0) {
|
||||
// Show osd on hover
|
||||
const showOsd = inRightPanel(panels.osd, x, y);
|
||||
|
||||
// // Always update visibility based on hover if not in shortcut mode
|
||||
if (!osdShortcutActive) {
|
||||
visibilities.osd = showOsd;
|
||||
root.panels.osd.hovered = showOsd;
|
||||
} else if (showOsd) {
|
||||
// If hovering over OSD area while in shortcut mode, transition to hover control
|
||||
osdShortcutActive = false;
|
||||
root.panels.osd.hovered = true;
|
||||
}
|
||||
|
||||
// const showSidebar = pressed && dragStart.x > bar.implicitWidth + panels.sidebar.x;
|
||||
//
|
||||
// // Show/hide session on drag
|
||||
// if (pressed && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
|
||||
// if (dragX < -Config.session.dragThreshold)
|
||||
// visibilities.session = true;
|
||||
// else if (dragX > Config.session.dragThreshold)
|
||||
// visibilities.session = false;
|
||||
//
|
||||
// // Show sidebar on drag if in session area and session is nearly fully visible
|
||||
// if (showSidebar && panels.session.width >= panels.session.nonAnimWidth && dragX < -Config.sidebar.dragThreshold)
|
||||
// visibilities.sidebar = true;
|
||||
// } else if (showSidebar && dragX < -Config.sidebar.dragThreshold) {
|
||||
// // Show sidebar on drag if not in session area
|
||||
// visibilities.sidebar = true;
|
||||
// }
|
||||
} else {
|
||||
const outOfSidebar = x < width - panels.sidebar.width;
|
||||
// Show osd on hover
|
||||
const showOsd = outOfSidebar && inRightPanel(panels.osd, x, y);
|
||||
|
||||
// Always update visibility based on hover if not in shortcut mode
|
||||
if (!osdShortcutActive) {
|
||||
visibilities.osd = showOsd;
|
||||
root.panels.osd.hovered = showOsd;
|
||||
} else if (showOsd) {
|
||||
// If hovering over OSD area while in shortcut mode, transition to hover control
|
||||
osdShortcutActive = false;
|
||||
root.panels.osd.hovered = true;
|
||||
}
|
||||
//
|
||||
// // Show/hide session on drag
|
||||
// if (pressed && outOfSidebar && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
|
||||
// if (dragX < -Config.session.dragThreshold)
|
||||
// visibilities.session = true;
|
||||
// else if (dragX > Config.session.dragThreshold)
|
||||
// visibilities.session = false;
|
||||
// }
|
||||
//
|
||||
// // Hide sidebar on drag
|
||||
// if (pressed && inRightPanel(panels.sidebar, dragStart.x, 0) && dragX > Config.sidebar.dragThreshold)
|
||||
// visibilities.sidebar = false;
|
||||
}
|
||||
|
||||
// Show launcher on hover, or show/hide on drag if hover is disabled
|
||||
// if (Config.launcher.showOnHover) {
|
||||
// if (!visibilities.launcher && inBottomPanel(panels.launcher, x, y))
|
||||
// visibilities.launcher = true;
|
||||
// } else if (pressed && inBottomPanel(panels.launcher, dragStart.x, dragStart.y) && withinPanelWidth(panels.launcher, x, y)) {
|
||||
// if (dragY < -Config.launcher.dragThreshold)
|
||||
// visibilities.launcher = true;
|
||||
// else if (dragY > Config.launcher.dragThreshold)
|
||||
// visibilities.launcher = false;
|
||||
// }
|
||||
//
|
||||
// // Show dashboard on hover
|
||||
// const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboard, x, y);
|
||||
//
|
||||
// // Always update visibility based on hover if not in shortcut mode
|
||||
// if (!dashboardShortcutActive) {
|
||||
// visibilities.dashboard = showDashboard;
|
||||
// } else if (showDashboard) {
|
||||
// // If hovering over dashboard area while in shortcut mode, transition to hover control
|
||||
// dashboardShortcutActive = false;
|
||||
// }
|
||||
//
|
||||
// // Show/hide dashboard on drag (for touchscreen devices)
|
||||
// if (pressed && inTopPanel(panels.dashboard, dragStart.x, dragStart.y) && withinPanelWidth(panels.dashboard, x, y)) {
|
||||
// if (dragY > Config.dashboard.dragThreshold)
|
||||
// visibilities.dashboard = true;
|
||||
// else if (dragY < -Config.dashboard.dragThreshold)
|
||||
// visibilities.dashboard = false;
|
||||
// }
|
||||
//
|
||||
// // Show utilities on hover
|
||||
// const showUtilities = inBottomPanel(panels.utilities, x, y);
|
||||
//
|
||||
// // Always update visibility based on hover if not in shortcut mode
|
||||
// if (!utilitiesShortcutActive) {
|
||||
// visibilities.utilities = showUtilities;
|
||||
// } else if (showUtilities) {
|
||||
// // If hovering over utilities area while in shortcut mode, transition to hover control
|
||||
// utilitiesShortcutActive = false;
|
||||
// }
|
||||
|
||||
// Show popouts on hover
|
||||
console.log(y)
|
||||
if (y < bar.implicitHeight) {
|
||||
bar.checkPopout(x);
|
||||
}
|
||||
}
|
||||
|
||||
// Monitor individual visibility changes
|
||||
Connections {
|
||||
target: root.visibilities
|
||||
|
||||
function onLauncherChanged() {
|
||||
// If launcher is hidden, clear shortcut flags for dashboard and OSD
|
||||
if (!root.visibilities.launcher) {
|
||||
root.dashboardShortcutActive = false;
|
||||
root.osdShortcutActive = false;
|
||||
root.utilitiesShortcutActive = false;
|
||||
|
||||
// Also hide dashboard and OSD if they're not being hovered
|
||||
const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
|
||||
const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
|
||||
|
||||
if (!inDashboardArea) {
|
||||
root.visibilities.dashboard = false;
|
||||
}
|
||||
if (!inOsdArea) {
|
||||
root.visibilities.osd = false;
|
||||
root.panels.osd.hovered = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function onDashboardChanged() {
|
||||
if (root.visibilities.dashboard) {
|
||||
// Dashboard became visible, immediately check if this should be shortcut mode
|
||||
const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
|
||||
if (!inDashboardArea) {
|
||||
root.dashboardShortcutActive = true;
|
||||
}
|
||||
} else {
|
||||
// Dashboard hidden, clear shortcut flag
|
||||
root.dashboardShortcutActive = false;
|
||||
}
|
||||
}
|
||||
|
||||
function onOsdChanged() {
|
||||
if (root.visibilities.osd) {
|
||||
// OSD became visible, immediately check if this should be shortcut mode
|
||||
const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
|
||||
if (!inOsdArea) {
|
||||
root.osdShortcutActive = true;
|
||||
}
|
||||
} else {
|
||||
// OSD hidden, clear shortcut flag
|
||||
root.osdShortcutActive = false;
|
||||
}
|
||||
}
|
||||
|
||||
function onUtilitiesChanged() {
|
||||
if (root.visibilities.utilities) {
|
||||
// Utilities became visible, immediately check if this should be shortcut mode
|
||||
const inUtilitiesArea = root.inBottomPanel(root.panels.utilities, root.mouseX, root.mouseY);
|
||||
if (!inUtilitiesArea) {
|
||||
root.utilitiesShortcutActive = true;
|
||||
}
|
||||
} else {
|
||||
// Utilities hidden, clear shortcut flag
|
||||
root.utilitiesShortcutActive = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import qs.Modules.Notifications as Notifications
|
||||
import qs.Modules.Notifications.Sidebar as Sidebar
|
||||
import qs.Modules.Notifications.Sidebar.Utils as Utils
|
||||
import qs.Modules.Dashboard as Dashboard
|
||||
import qs.Modules.Osd as Osd
|
||||
import qs.Config
|
||||
|
||||
Item {
|
||||
@@ -20,11 +21,24 @@ Item {
|
||||
readonly property alias notifications: notifications
|
||||
readonly property alias utilities: utilities
|
||||
readonly property alias dashboard: dashboard
|
||||
readonly property alias osd: osd
|
||||
|
||||
anchors.fill: parent
|
||||
// anchors.margins: 8
|
||||
anchors.topMargin: bar.implicitHeight
|
||||
|
||||
Osd.Wrapper {
|
||||
id: osd
|
||||
|
||||
clip: session.width > 0 || sidebar.width > 0
|
||||
screen: root.screen
|
||||
visibilities: root.visibilities
|
||||
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: sidebar.width
|
||||
}
|
||||
|
||||
Modules.Wrapper {
|
||||
id: popouts
|
||||
|
||||
|
||||
Reference in New Issue
Block a user