fixup layering
This commit is contained in:
parent
077e0bf4d5
commit
a61ad3e7b9
6 changed files with 117 additions and 3 deletions
|
|
@ -16,6 +16,10 @@ Rectangle {
|
||||||
radius: Config.cfg.appearance.rounding
|
radius: Config.cfg.appearance.rounding
|
||||||
implicitWidth: audioLayout.implicitWidth + 10
|
implicitWidth: audioLayout.implicitWidth + 10
|
||||||
implicitHeight: audioLayout.implicitHeight + 10
|
implicitHeight: audioLayout.implicitHeight + 10
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
acceptedButtons: Qt.AllButtons
|
||||||
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: audioLayout
|
id: audioLayout
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,10 @@ import qs.settings
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: wallPicker
|
id: wallPicker
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
acceptedButtons: Qt.AllButtons
|
||||||
|
}
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: container
|
id: container
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
|
||||||
101
modules/overlays/#Top.qml#
Normal file
101
modules/overlays/#Top.qml#
Normal file
|
|
@ -0,0 +1,101 @@
|
||||||
|
import QtQuick
|
||||||
|
import Quickshell
|
||||||
|
import Quickshell.Wayland
|
||||||
|
import qs.modules.Services
|
||||||
|
import qs.modules.applets
|
||||||
|
import qs.settings
|
||||||
|
|
||||||
|
Variants {
|
||||||
|
model: Quickshell.screens
|
||||||
|
delegate: PanelWindow {
|
||||||
|
id: root
|
||||||
|
required property ShellScreen modelData
|
||||||
|
property bool shown: WidgetTracker.current !== "" && WidgetTracker.screen === modelData
|
||||||
|
|
||||||
|
screen: modelData
|
||||||
|
anchors {
|
||||||
|
top: true
|
||||||
|
left: true
|
||||||
|
bottom: true
|
||||||
|
right: true
|
||||||
|
}
|
||||||
|
exclusionMode: ExclusionMode.Ignore
|
||||||
|
color: 'transparent'
|
||||||
|
visible: true
|
||||||
|
mask: Region {
|
||||||
|
item: root.shown ? dismisser : null
|
||||||
|
}
|
||||||
|
WlrLayershell.keyboardFocus: shown ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
|
||||||
|
Item {
|
||||||
|
anchors.fill: parent
|
||||||
|
focus: true
|
||||||
|
Keys.onEscapePressed: event => {
|
||||||
|
WidgetTracker.close();
|
||||||
|
event.accepted = true;
|
||||||
|
}
|
||||||
|
VolPopup {
|
||||||
|
id: volPopup
|
||||||
|
z: 1
|
||||||
|
property bool shown: root.shown && WidgetTracker.current === "volume"
|
||||||
|
opacity: shown ? 1 : 0
|
||||||
|
visible: opacity > 0
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.topMargin: Config.cfg.bar.floating ? Config.cfg.bar.height + 20 : Config.cfg.bar.height
|
||||||
|
anchors.rightMargin: 10
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: 140
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
transform: Translate {
|
||||||
|
y: volPopup.shown ? 0 : -12
|
||||||
|
Behavior on y {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: 140
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
WallPicker {
|
||||||
|
id: wallpapers
|
||||||
|
z: 1
|
||||||
|
property bool shown: root.shown && WidgetTracker.current === "wallpapers"
|
||||||
|
opacity: shown ? 1 : 0
|
||||||
|
visible: opacity > 0
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.margins: 20
|
||||||
|
implicitWidth: 1000
|
||||||
|
implicitHeight: 200
|
||||||
|
|
||||||
|
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: 200
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
transform: Translate {
|
||||||
|
y: wallpapers.shown ? 0 : 12
|
||||||
|
Behavior on y {
|
||||||
|
NumberAnimation {
|
||||||
|
duration: 200
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MouseArea {
|
||||||
|
id: dismisser
|
||||||
|
z: 0
|
||||||
|
anchors.fill: parent
|
||||||
|
acceptedButtons: Qt.LeftButton
|
||||||
|
onClicked: WidgetTracker.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1
modules/overlays/.#Top.qml
Symbolic link
1
modules/overlays/.#Top.qml
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
lucy@nerv.13460:1787927060
|
||||||
|
|
@ -28,7 +28,7 @@ Variants {
|
||||||
WlrLayershell.keyboardFocus: shown ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
|
WlrLayershell.keyboardFocus: shown ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
|
||||||
Item {
|
Item {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
focus: true
|
focus: true
|
||||||
Keys.onEscapePressed: event => {
|
Keys.onEscapePressed: event => {
|
||||||
WidgetTracker.close();
|
WidgetTracker.close();
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
|
|
@ -71,6 +71,10 @@ Variants {
|
||||||
anchors.margins: 20
|
anchors.margins: 20
|
||||||
implicitWidth: 1000
|
implicitWidth: 1000
|
||||||
implicitHeight: 200
|
implicitHeight: 200
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
acceptedButtons: Qt.AllButtons
|
||||||
|
}
|
||||||
|
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
NumberAnimation {
|
NumberAnimation {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"appearance": {
|
"appearance": {
|
||||||
"font": "Iosevka",
|
"font": "Iosevka",
|
||||||
"fontSize": 14,
|
"fontSize": 14,
|
||||||
"iconSize": 22,
|
"iconSize": 14,
|
||||||
"rounding": 16
|
"rounding": 16
|
||||||
},
|
},
|
||||||
"bar": {
|
"bar": {
|
||||||
|
|
@ -12,6 +12,6 @@
|
||||||
},
|
},
|
||||||
"wallpaper": {
|
"wallpaper": {
|
||||||
"wallDir": "/home/lucy/.walls/",
|
"wallDir": "/home/lucy/.walls/",
|
||||||
"wallpaper": "/home/lucy/.walls/walkingcastle.png"
|
"wallpaper": "/home/lucy/.walls/frierensuff.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue