Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 05:25:41 -05:00
Code Packages Releases Activity

modules cleanup and qmlfmt everywhere

Browse Source 
- throw in 24H clock fix and app drawer fix too
This commit is contained in:
bbedward
2025-09-03 23:26:07 -04:00
parent 178ccd3634
commit 21867c842f
55 changed files with 2720 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Modules/OSD/BrightnessOSD.qml
View File

@@ -24,7 +24,6 @@ DankOSD {
}
}
Connections {
target: DisplayService
function onBrightnessChanged() {
@@ -54,12 +53,13 @@ DankOSD {
anchors.centerIn: parent
name: {
const deviceInfo = DisplayService.getCurrentDeviceInfo()
if (!deviceInfo || deviceInfo.class === "backlight" || deviceInfo.class === "ddc")
if (!deviceInfo || deviceInfo.class === "backlight" || deviceInfo.class === "ddc") {
return "brightness_medium"
else if (deviceInfo.name.includes("kbd"))
} else if (deviceInfo.name.includes("kbd")) {
return "keyboard"
else
} else {
return "lightbulb"
}
}
size: Theme.iconSize
color: Theme.primary
@@ -80,40 +80,43 @@ DankOSD {
unit: "%"
Component.onCompleted: {
if (DisplayService.brightnessAvailable)
value = DisplayService.brightnessLevel
}
onSliderValueChanged: function(newValue) {
if (DisplayService.brightnessAvailable) {
root.brightnessDebounceTimer.pendingValue = newValue
root.brightnessDebounceTimer.restart()
resetHideTimer()
value = DisplayService.brightnessLevel
}
}
onSliderValueChanged: newValue => {
if (DisplayService.brightnessAvailable) {
root.brightnessDebounceTimer.pendingValue = newValue
root.brightnessDebounceTimer.restart()
resetHideTimer()
}
}
onContainsMouseChanged: {
setChildHovered(containsMouse)
}
onSliderDragFinished: function(finalValue) {
if (DisplayService.brightnessAvailable) {
root.brightnessDebounceTimer.stop()
DisplayService.setBrightnessInternal(finalValue, DisplayService.lastIpcDevice)
}
}
onSliderDragFinished: finalValue => {
if (DisplayService.brightnessAvailable) {
root.brightnessDebounceTimer.stop()
DisplayService.setBrightnessInternal(finalValue, DisplayService.lastIpcDevice)
}
}
Connections {
target: DisplayService
function onBrightnessChanged() {
if (!brightnessSlider.pressed)
if (!brightnessSlider.pressed) {
brightnessSlider.value = DisplayService.brightnessLevel
}
}
function onDeviceSwitched() {
if (!brightnessSlider.pressed)
if (!brightnessSlider.pressed) {
brightnessSlider.value = DisplayService.brightnessLevel
}
}
}
}
@@ -122,9 +125,10 @@ DankOSD {
onOsdShown: {
if (DisplayService.brightnessAvailable && contentLoader.item) {
let slider = contentLoader.item.children[0].children[1]
if (slider)
const slider = contentLoader.item.children[0].children[1]
if (slider) {
slider.value = DisplayService.brightnessLevel
}
}
}
}
}

2
Modules/OSD/IdleInhibitorOSD.qml
View File

@@ -24,4 +24,4 @@ DankOSD {
size: Theme.iconSize
color: SessionService.idleInhibited ? Theme.primary : Theme.outline
}
}
}

2
Modules/OSD/MicMuteOSD.qml
View File

@@ -24,4 +24,4 @@ DankOSD {
size: Theme.iconSize
color: AudioService.source && AudioService.source.audio && AudioService.source.audio.muted ? Theme.error : Theme.primary
}
}
}

29
Modules/OSD/VolumeOSD.qml
View File

@@ -11,7 +11,6 @@ DankOSD {
autoHideInterval: 3000
enableMouseInteraction: true
Connections {
target: AudioService
@@ -20,8 +19,9 @@ DankOSD {
}
function onSinkChanged() {
if (root.shouldBeVisible)
if (root.shouldBeVisible) {
root.show()
}
}
}
@@ -80,17 +80,18 @@ DankOSD {
unit: "%"
Component.onCompleted: {
if (AudioService.sink && AudioService.sink.audio)
value = Math.round(AudioService.sink.audio.volume * 100)
}
onSliderValueChanged: function(newValue) {
if (AudioService.sink && AudioService.sink.audio) {
AudioService.sink.audio.volume = newValue / 100
resetHideTimer()
value = Math.round(AudioService.sink.audio.volume * 100)
}
}
onSliderValueChanged: newValue => {
if (AudioService.sink && AudioService.sink.audio) {
AudioService.sink.audio.volume = newValue / 100
resetHideTimer()
}
}
onContainsMouseChanged: {
setChildHovered(containsMouse || muteButton.containsMouse)
}
@@ -99,8 +100,9 @@ DankOSD {
target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
function onVolumeChanged() {
if (volumeSlider && !volumeSlider.pressed)
if (volumeSlider && !volumeSlider.pressed) {
volumeSlider.value = Math.round(AudioService.sink.audio.volume * 100)
}
}
}
}
@@ -109,9 +111,10 @@ DankOSD {
onOsdShown: {
if (AudioService.sink && AudioService.sink.audio && contentLoader.item) {
let slider = contentLoader.item.children[0].children[1]
if (slider)
const slider = contentLoader.item.children[0].children[1]
if (slider) {
slider.value = Math.round(AudioService.sink.audio.volume * 100)
}
}
}
}
}