Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell
This commit is contained in:
commit
e237bd04ff
3 changed files with 13 additions and 12 deletions
|
|
@ -29,15 +29,11 @@ NIconButton {
|
|||
|
||||
// Icon states
|
||||
icon: {
|
||||
if (ArchUpdaterService.busy || ArchUpdaterService.aurBusy)
|
||||
if (ArchUpdaterService.busy || ArchUpdaterService.aurBusy) {
|
||||
return "sync"
|
||||
}
|
||||
if (ArchUpdaterService.totalUpdates > 0) {
|
||||
const count = ArchUpdaterService.totalUpdates
|
||||
if (count > 50)
|
||||
return "system_update_alt"
|
||||
if (count > 10)
|
||||
return "system_update"
|
||||
return "system_update"
|
||||
return "filter_none"
|
||||
}
|
||||
return "task_alt"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,10 +14,12 @@ Item {
|
|||
|
||||
// Used to avoid opening the pill on Quickshell startup
|
||||
property bool firstVolumeReceived: false
|
||||
property int wheelAccumulator: 0
|
||||
|
||||
implicitWidth: pill.width
|
||||
implicitHeight: pill.height
|
||||
|
||||
|
||||
function getIcon() {
|
||||
if (AudioService.muted) {
|
||||
return "volume_off"
|
||||
|
|
@ -59,10 +61,13 @@ Item {
|
|||
tooltipText: "Volume: " + Math.round(
|
||||
AudioService.volume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume."
|
||||
|
||||
onWheel: function (angle) {
|
||||
if (angle > 0) {
|
||||
onWheel: function (delta) {
|
||||
wheelAccumulator += delta
|
||||
if (wheelAccumulator >= 120) {
|
||||
wheelAccumulator = 0
|
||||
AudioService.increaseVolume()
|
||||
} else if (angle < 0) {
|
||||
} else if (wheelAccumulator <= -120) {
|
||||
wheelAccumulator = 0
|
||||
AudioService.decreaseVolume()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue