Compare commits

..

No commits in common. "20ac6d0315a68a264747f1fbb0718b4e8d44c5e2" and "24d4c6cc3bc3dd52d5921511d90bf887e42fc7df" have entirely different histories.

2 changed files with 35 additions and 55 deletions

14
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1769740369,
"narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
"lastModified": 1759386674,
"narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
"rev": "625ad6366178f03acd79f9e3822606dd7985b657",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
]
},
"locked": {
"lastModified": 1769593411,
"narHash": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=",
"rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a",
"lastModified": 1759610621,
"narHash": "sha256-P3UPFd95mS/3aNgy40nCXAmyfR2bEEBd+tX6xfkYFb0=",
"rev": "c5c438f1cd1a76660a8658ef929a3d19e968e2ce",
"type": "tarball",
"url": "https://git.outfoxxed.me/api/v1/repos/quickshell/quickshell/archive/1e4d804e7f3fa7465811030e8da2bf10d544426a.tar.gz"
"url": "https://git.outfoxxed.me/api/v1/repos/quickshell/quickshell/archive/c5c438f1cd1a76660a8658ef929a3d19e968e2ce.tar.gz"
},
"original": {
"type": "tarball",

View file

@ -1,7 +1,6 @@
import Quickshell
import Quickshell.Services.UPower
import QtQuick
import QtQuick.Effects
import QtQuick.Layouts
import qs.services
import qs.config
@ -85,7 +84,7 @@ Container {
}
}
Item {
MaterialIcon {
id: battery
objectName: "battery"
@ -93,66 +92,47 @@ Container {
Layout.leftMargin: hasBattery ? -2 : 0
Layout.topMargin: hasBattery ? 0.5 : 2
implicitWidth: batteryIcon.width
implicitHeight: batteryIcon.height
readonly property bool hasBattery: UPower.displayDevice.isLaptopBattery
readonly property real percentage: 0.5 // Power.displayDevice.percentage
readonly property real percentage: UPower.displayDevice.percentage
readonly property bool charging: !UPower.onBattery && batteryText.text !== "100"
readonly property bool warning: UPower.onBattery && percentage < Config.services.batteryWarning + 0.01
MaterialIcon {
id: batteryIcon
anchors.centerIn: parent
text: {
if (!battery.hasBattery) {
if (PowerProfiles.profile === PowerProfile.PowerSaver)
text: {
if (!hasBattery) {
if (PowerProfiles.profile === PowerProfile.PowerSaver)
return "energy_savings_leaf";
if (PowerProfiles.profile === PowerProfile.Performance)
if (PowerProfiles.profile === PowerProfile.Performance)
return "rocket_launch";
return "balance";
}
return `battery_android_full`;
return "balance";
}
fill: 1
font.pointSize: battery.hasBattery ? 18 : Config.font.size.normal
grade: 50
font.weight: 100
color: !battery.hasBattery ? Config.colors.secondary :
battery.warning ? Config.colors.errorBg :
batteryText.text === "100" ? Config.colors.battery :
Color.mute(Config.colors.battery, 0.6, 1.5)
layer.enabled: true
return `battery_android_full`;
}
fill: 1
font.pointSize: hasBattery ? 18 : Config.font.size.normal
grade: 50
font.weight: 100
color: !hasBattery ? Config.colors.secondary :
warning ? Config.colors.errorBg :
batteryText.text === "100" ? Config.colors.battery :
Color.mute(Config.colors.battery, 0.6, 1.5)
Item {
id: meter
anchors.fill: batteryIcon
visible: false
CustomRect {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: parent.left
width: battery.width * battery.percentage
color: battery.warning ? Config.colors.batteryWarning : Config.colors.battery
}
}
MultiEffect {
anchors.fill: batteryIcon
CustomRect {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.topMargin: 9
anchors.bottomMargin: 9
anchors.leftMargin: 3
width: (battery.width - 7) * battery.percentage
radius: 2
visible: battery.hasBattery
source: meter
maskEnabled: true
maskSource: batteryIcon
color: battery.warning ? Config.colors.batteryWarning : Config.colors.battery
}
Row {
anchors.centerIn: parent
anchors.horizontalCenterOffset: battery.charging ? 0 : -width / 10
anchors.horizontalCenterOffset: battery.charging ? width / 20 : -width / 15
visible: battery.hasBattery
spacing: -1
@ -175,7 +155,7 @@ Container {
visible: battery.charging
text: "bolt"
fill: 1
color: battery.warning ? Config.colors.batteryWarning : Config.colors.bg
color: Config.colors.bg
font.pointSize: 7
font.weight: 300
}