Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-30 16:32:50 -05:00
Code Packages Releases Activity

brightness: remember max val

Browse Source
This commit is contained in:
bbedward
2025-11-05 09:28:00 -05:00
parent a5f92165fb
commit d48cd1acdd
1 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Services/DisplayService.qml
View File

@@ -14,6 +14,7 @@ Singleton {
property var devices: [] property var devices: []
property var deviceBrightness: ({}) property var deviceBrightness: ({})
property var deviceBrightnessUserSet: ({}) property var deviceBrightnessUserSet: ({})
property var deviceMaxCache: ({})
property int brightnessVersion: 0 property int brightnessVersion: 0
property string currentDevice: "" property string currentDevice: ""
property string lastIpcDevice: "" property string lastIpcDevice: ""
@@ -43,6 +44,14 @@ Singleton {
const deviceIndex = devices.findIndex(d => d.id === device.id) const deviceIndex = devices.findIndex(d => d.id === device.id)
if (deviceIndex !== -1) { if (deviceIndex !== -1) {
const newDevices = [...devices] const newDevices = [...devices]
let displayMax = device.class === "ddc" ? device.max : 100
if (displayMax <= 0 && deviceMaxCache[device.id]) {
displayMax = deviceMaxCache[device.id]
} else if (displayMax > 0) {
const newCache = Object.assign({}, deviceMaxCache)
newCache[device.id] = displayMax
deviceMaxCache = newCache
}
newDevices[deviceIndex] = { newDevices[deviceIndex] = {
"id": device.id, "id": device.id,
"name": device.id, "name": device.id,
@@ -51,7 +60,7 @@ Singleton {
"percentage": device.currentPercent, "percentage": device.currentPercent,
"max": device.max, "max": device.max,
"backend": device.backend, "backend": device.backend,
"displayMax": device.class === "ddc" ? device.max : 100 "displayMax": displayMax
} }
devices = newDevices devices = newDevices
} }
@@ -89,7 +98,16 @@ Singleton {
return return
} }
devices = state.devices.map(d => ({ devices = state.devices.map(d => {
let displayMax = d.class === "ddc" ? d.max : 100
if (displayMax <= 0 && deviceMaxCache[d.id]) {
displayMax = deviceMaxCache[d.id]
} else if (displayMax > 0) {
const newCache = Object.assign({}, deviceMaxCache)
newCache[d.id] = displayMax
deviceMaxCache = newCache
}
return {
"id": d.id, "id": d.id,
"name": d.id, "name": d.id,
"class": d.class, "class": d.class,
@@ -97,8 +115,9 @@ Singleton {
"percentage": d.currentPercent, "percentage": d.currentPercent,
"max": d.max, "max": d.max,
"backend": d.backend, "backend": d.backend,
"displayMax": d.class === "ddc" ? d.max : 100 "displayMax": displayMax
})) }
})
const newBrightness = {} const newBrightness = {}
for (const device of state.devices) { for (const device of state.devices) {
@@ -149,6 +168,12 @@ Singleton {
const deviceInfo = getCurrentDeviceInfoByName(actualDevice) const deviceInfo = getCurrentDeviceInfoByName(actualDevice)
const minValue = (deviceInfo && (deviceInfo.class === "backlight" || deviceInfo.class === "ddc")) ? 1 : 0 const minValue = (deviceInfo && (deviceInfo.class === "backlight" || deviceInfo.class === "ddc")) ? 1 : 0
const maxValue = deviceInfo?.displayMax || 100 const maxValue = deviceInfo?.displayMax || 100
if (maxValue <= 0) {
console.warn("DisplayService: Invalid max value for device", actualDevice, "- skipping brightness change")
return
}
const clampedValue = Math.max(minValue, Math.min(maxValue, percentage)) const clampedValue = Math.max(minValue, Math.min(maxValue, percentage))
if (!DMSService.isConnected) { if (!DMSService.isConnected) {