Skip to content

Commit 0c4a9b4

Browse files
authored
feat: 色温调节支持用户自定义 (#287)
色温调节支持用户自定义 Log: 色温调节支持用户自定义
1 parent 7ea906a commit 0c4a9b4

File tree

3 files changed

+42
-22
lines changed

3 files changed

+42
-22
lines changed

display/color_temp.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"bufio"
99
"bytes"
1010
"errors"
11-
configManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
1211
"math"
1312
"os"
1413
"os/exec"
@@ -18,6 +17,8 @@ import (
1817
"sync"
1918
"time"
2019

20+
configManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
21+
2122
"github.com/godbus/dbus/v5"
2223
geoclue2 "github.com/linuxdeepin/go-dbus-factory/system/org.freedesktop.geoclue2"
2324
"github.com/linuxdeepin/go-lib/dbusutil"
@@ -544,8 +545,10 @@ func (m *Manager) setCustomColorTempTimePeriod(timePeriod string) error {
544545
re := regexp.MustCompile(pattern)
545546
var err error
546547
if re.MatchString(timePeriod) {
547-
m.CustomColorTempTimePeriod = timePeriod
548548
err = setGlobalDconfValue(DSettingsAppID, DSettingsDisplayName, "", DSettingsKeyCustomModeTime, dbus.MakeVariant(timePeriod))
549+
if err == nil {
550+
m.setPropCustomColorTempTimePeriod(timePeriod)
551+
}
549552
} else {
550553
err = errors.New("The timeperiod parameter is invalid")
551554
}

display/display_dbusutil.go

Lines changed: 32 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

display/manager_ifc.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,5 +318,9 @@ func (m *Manager) SupportSetColorTemperature() (bool, *dbus.Error) {
318318

319319
func (m *Manager) SetCustomColorTempTimePeriod(timePeriod string) *dbus.Error {
320320
err := m.setCustomColorTempTimePeriod(timePeriod)
321-
return dbusutil.ToError(err)
321+
if err != nil {
322+
logger.Warning(err)
323+
return dbusutil.ToError(err)
324+
}
325+
return nil
322326
}

0 commit comments

Comments
 (0)