dock
This commit is contained in:
@@ -13,6 +13,7 @@ import qs.Modules.Launcher as Launcher
|
||||
import qs.Modules.Resources as Resources
|
||||
import qs.Modules.Drawing as Drawing
|
||||
import qs.Modules.Settings as Settings
|
||||
import qs.Modules.Dock as Dock
|
||||
|
||||
Shape {
|
||||
id: root
|
||||
@@ -24,6 +25,7 @@ Shape {
|
||||
anchors.fill: parent
|
||||
anchors.margins: Config.barConfig.border
|
||||
anchors.topMargin: bar.implicitHeight
|
||||
asynchronous: true
|
||||
preferredRendererType: Shape.CurveRenderer
|
||||
|
||||
Drawing.Background {
|
||||
@@ -93,4 +95,12 @@ Shape {
|
||||
startY: 0
|
||||
wrapper: root.panels.settings
|
||||
}
|
||||
|
||||
Dock.Background {
|
||||
id: dock
|
||||
|
||||
startX: (root.width - wrapper.width) / 2 - rounding
|
||||
startY: root.height
|
||||
wrapper: root.panels.dock
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,6 +107,9 @@ CustomMouseArea {
|
||||
}
|
||||
}
|
||||
|
||||
if (!visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
|
||||
visibilities.dock = true;
|
||||
|
||||
if (y < root.bar.implicitHeight) {
|
||||
root.bar.checkPopout(x);
|
||||
}
|
||||
@@ -145,6 +148,9 @@ CustomMouseArea {
|
||||
root.panels.osd.hovered = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (root.visibilities.launcher)
|
||||
root.visibilities.dock = false;
|
||||
}
|
||||
|
||||
function onOsdChanged() {
|
||||
|
||||
@@ -12,6 +12,7 @@ import qs.Modules.Launcher as Launcher
|
||||
import qs.Modules.Resources as Resources
|
||||
import qs.Modules.Settings as Settings
|
||||
import qs.Modules.Drawing as Drawing
|
||||
import qs.Modules.Dock as Dock
|
||||
import qs.Config
|
||||
|
||||
Item {
|
||||
@@ -19,6 +20,7 @@ Item {
|
||||
|
||||
required property Item bar
|
||||
readonly property alias dashboard: dashboard
|
||||
readonly property alias dock: dock
|
||||
readonly property alias drawing: drawing
|
||||
required property Canvas drawingItem
|
||||
readonly property alias launcher: launcher
|
||||
@@ -143,4 +145,14 @@ Item {
|
||||
panels: root
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
|
||||
Dock.Wrapper {
|
||||
id: dock
|
||||
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
panels: root
|
||||
screen: root.screen
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
}
|
||||
|
||||
+4
-2
@@ -33,7 +33,7 @@ Variants {
|
||||
property var root: Quickshell.shellDir
|
||||
|
||||
WlrLayershell.exclusionMode: ExclusionMode.Ignore
|
||||
WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
|
||||
WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
|
||||
color: "transparent"
|
||||
contentItem.focus: true
|
||||
mask: visibilities.isDrawing ? null : region
|
||||
@@ -94,7 +94,7 @@ Variants {
|
||||
HyprlandFocusGrab {
|
||||
id: focusGrab
|
||||
|
||||
active: visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu"))
|
||||
active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu"))
|
||||
windows: [win]
|
||||
|
||||
onCleared: {
|
||||
@@ -104,6 +104,7 @@ Variants {
|
||||
visibilities.osd = false;
|
||||
visibilities.settings = false;
|
||||
visibilities.resources = false;
|
||||
visibilities.dock = false;
|
||||
panels.popouts.hasCurrent = false;
|
||||
}
|
||||
}
|
||||
@@ -113,6 +114,7 @@ Variants {
|
||||
|
||||
property bool bar
|
||||
property bool dashboard
|
||||
property bool dock
|
||||
property bool isDrawing
|
||||
property bool launcher
|
||||
property bool notif: NotifServer.popups.length > 0
|
||||
|
||||
Reference in New Issue
Block a user