baobeld/lux-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: baobeld:f8369a340ba0184b59b2354378050160d610ad77
Branches Tags
baobeld:main
baobeld:unify-windows
..
compare: baobeld:c4f0fbc1ee4d537a98c57e2678d4cae4348bad17
Branches Tags
baobeld:main
baobeld:unify-windows

No commits in common. "f8369a340ba0184b59b2354378050160d610ad77" and "c4f0fbc1ee4d537a98c57e2678d4cae4348bad17" have entirely different histories.
f8369a340b ... c4f0fbc1ee

10 changed files with 47 additions and 210 deletions
Show stats Expand all files Collapse all files

10
config/Dimensions.qml
View file

@ -11,7 +11,6 @@ Singleton {
property Bar bar: Bar {}
property Mpris mpris: Mpris {}
property Clock clock: Clock {}
property Caffeine caffeine: Caffeine {}
property Workspace workspace: Workspace {}
property Tray tray: Tray {}
property TrayMenu trayMenu: TrayMenu {}
@ -46,15 +45,6 @@ Singleton {
property int verticalPadding: 6
}
component Caffeine: QtObject {
id: clock
property int iconSize: 14
property int height: 30
property int horizontalPadding: 8
property int verticalPadding: 6
}
component Workspace: QtObject {
id: workspace

1
constants/Icons.qml
View file

@ -3,7 +3,6 @@ pragma Singleton
import Quickshell
Singleton {
property string coffee: "\u{E09a}"
property string triangle: "\u{E192}"
property string triangleDashed: "\u{E642}"
}

12
modules/bar/Bar.qml
View file

@ -75,9 +75,7 @@ Scope {
spacing: Dimensions.bar.spacing
Mpris {
anchors.verticalCenter: parent.verticalCenter
}
Mpris {}
}
Row {
@ -92,13 +90,7 @@ Scope {
spacing: Dimensions.bar.spacing
Caffeine {
anchors.verticalCenter: parent.verticalCenter
}
Clock {
anchors.verticalCenter: parent.verticalCenter
}
Clock {}
}
}
}

46
modules/bar/components/Caffeine.qml
View file

@ -1,46 +0,0 @@
import QtQuick
import Quickshell.Io
import "../../../config/"
import "../../../constants/"
import "../../../styled/"
Clickable {
id: clickable
implicitWidth: text.width
implicitHeight: Dimensions.caffeine.height
border.color: process.running ? Theme.palette.secondary : 'transparent'
border.width: 2
onClicked: {
if (process.running) {
process.signal(888);
process.running = false;
} else {
process.running = true;
}
}
StyledText {
id: text
font.family: Theme.lucide.font.family
font.pixelSize: Dimensions.workspace.iconSize
font.bold: true
text: Icons.coffee
color: clickable.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent
anchors.verticalCenter: parent.verticalCenter
topPadding: Dimensions.mpris.verticalPadding
bottomPadding: Dimensions.mpris.verticalPadding
leftPadding: Dimensions.mpris.horizontalPadding
rightPadding: Dimensions.mpris.horizontalPadding
}
Process {
id: process
command: ["sh", "-c", "systemd-inhibit --what=idle --who=Caffeine --why=Caffeine --mode=block sleep inf"]
}
}

10
modules/bar/components/Clock.qml
View file

@ -1,11 +1,19 @@
import Quickshell
import Quickshell.Io
import QtQuick
import "../../../styled/"
import "../../../config/"
StyledLabel {
Item {
id: root
implicitWidth: childrenRect.width
implicitHeight: Dimensions.clock.height
StyledLabel {
anchors.fill: parent
}
StyledText {
id: text
anchors.verticalCenter: parent.verticalCenter

21
modules/bar/components/tray/TrayItem.qml
View file

@ -38,17 +38,32 @@ Clickable {
anchors.centerIn: parent
}
Menu {
id: menu
PopupWindow {
id: popup
opened: root.menuOpened
visible: root.menuOpened
color: 'transparent'
anchor.item: root
anchor.rect.x: root.width / 2 - width / 2
anchor.rect.y: root.height + 8
implicitWidth: menu.width
implicitHeight: menu.height
Rectangle {
anchors.fill: parent
color: Theme.palette.base300
radius: 8
}
Menu {
id: menu
menuOpener: QsMenuOpener {
menu: trayItem.menu
}
}
}
}

128
modules/bar/components/tray/menu/Menu.qml
View file

@ -1,146 +1,30 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import Quickshell
import "../../../../../config/"
import "../../../../../styled/"
PopupWindow {
id: window
property QsMenuOpener menuOpener
property bool opened: false
color: 'transparent'
implicitWidth: menu.width
implicitHeight: menu.height
Rectangle {
id: background
anchors.fill: menu
color: Theme.palette.base300
border.color: Theme.palette.base200
border.width: 2
radius: 8
opacity: 0
states: State {
name: "opened"
when: window.opened
PropertyChanges {
background {
opacity: 1
}
}
}
transitions: [
Transition {
from: ""
to: "opened"
SequentialAnimation {
ScriptAction {
script: window.visible = true
}
NumberAnimation {
property: "background.opacity"
duration: 200
}
}
},
Transition {
from: "opened"
to: ""
SequentialAnimation {
PauseAnimation {
duration: repeater.count * 15
}
NumberAnimation {
property: "background.opacity"
duration: 200
}
ScriptAction {
script: window.visible = false
}
}
}
]
}
ColumnLayout {
ColumnLayout {
id: menu
property QsMenuOpener menuOpener
anchors.margins: 30
anchors.margins: 8
Repeater {
id: repeater
model: window.menuOpener.children
model: menuOpener.children
delegate: Loader {
id: loader
required property QsMenuEntry modelData
required property int index
active: true
opacity: 0
Layout.minimumWidth: 120
sourceComponent: modelData.isSeparator ? menuSeperator : menuItem
property Component menuSeperator: Rectangle {
implicitHeight: 1
implicitWidth: menu.width
implicitHeight: 2
color: Theme.palette.base100
color: Theme.palette.basecontent
}
property Component menuItem: MenuItem {
menuEntry: modelData
}
states: State {
name: "opened"
when: window.opened
PropertyChanges {
loader {
opacity: 1
}
}
}
transitions: [
Transition {
from: ""
to: "opened"
SequentialAnimation {
PauseAnimation {
duration: 15 * loader.index
}
NumberAnimation {
property: "opacity"
duration: 100
}
}
},
Transition {
from: "opened"
to: ""
SequentialAnimation {
PauseAnimation {
duration: 15 * (repeater.count - loader.index)
}
NumberAnimation {
property: "opacity"
duration: 200
}
}
}
]
}
}
}
}

2
modules/bar/components/tray/menu/MenuItem.qml
View file

@ -16,8 +16,6 @@ Clickable {
StyledText {
id: text
opacity: item.opacity
font.pixelSize: Dimensions.clock.fontSize
anchors.verticalCenter: parent.verticalCenter
topPadding: Dimensions.clock.verticalPadding

3
styled/Clickable.qml
View file

@ -6,11 +6,8 @@ MouseArea {
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
property alias color: rectangle.color
property alias border: rectangle.border
Rectangle {
id: rectangle
anchors.fill: parent
radius: Dimensions.radius