Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 支持插件设置护眼模式 #258

Merged
merged 1 commit into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions display/color_temp.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ func (m *Manager) saveColorTempValueInCfg(value int32) {
func (m *Manager) saveColorTempModeInCfg(mode int32) {
m.modifySuitableUserMonitorModeConfig(func(cfg *UserMonitorModeConfig) {
cfg.ColorTemperatureMode = mode
if cfg.ColorTemperatureMode != ColorTemperatureModeNone {
cfg.ColorTemperatureModeOn = cfg.ColorTemperatureMode
}
})
err := m.saveUserConfig()
if err != nil {
Expand Down
27 changes: 27 additions & 0 deletions display/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,33 @@ func Start(service *dbusutil.Service) error {
if err != nil {
return err
}
so := service.GetServerObject(m)
if so != nil {
err = so.SetWriteCallback(m, "ColorTemperatureEnabled", func(write *dbusutil.PropertyWrite) *dbus.Error {
value, ok := write.Value.(bool)
if !ok {
err = errors.New("Type is not bool")
logger.Warning(err)
return dbusutil.ToError(err)
}
ok = m.setPropColorTemperatureEnabled(value)
if !ok {
err = errors.New("Set ColorTemperatureEnabled failed!")
logger.Warning(err)
return dbusutil.ToError(err)
}
cfg := m.getSuitableUserMonitorModeConfig(m.DisplayMode)
if cfg == nil {
cfg = getDefaultUserMonitorModeConfig()
}
mode := ColorTemperatureModeNone
if value {
mode = cfg.ColorTemperatureModeOn
}
err = m.setColorTempMode(mode)
return dbusutil.ToError(err)
})
}

err = service.RequestName(dbusServiceName)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions display/displayconf.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ const (
type UserMonitorModeConfig struct {
ColorTemperatureMode int32
ColorTemperatureManual int32
ColorTemperatureModeOn int32 //记录用户开启色温时的模式
// 以后如果有必要
// Monitors UserMonitorConfigs
}
Expand All @@ -83,6 +84,9 @@ func (c *UserMonitorModeConfig) fix() {
if !isValidColorTempValue(c.ColorTemperatureManual) {
c.ColorTemperatureManual = defaultTemperatureManual
}
if c.ColorTemperatureMode != ColorTemperatureModeNone {
c.ColorTemperatureModeOn = c.ColorTemperatureMode
}
}

func (c *UserMonitorModeConfig) clone() *UserMonitorModeConfig {
Expand All @@ -97,6 +101,8 @@ func getDefaultUserMonitorModeConfig() *UserMonitorModeConfig {
return &UserMonitorModeConfig{
ColorTemperatureMode: defaultTemperatureMode,
ColorTemperatureManual: defaultTemperatureManual,
// TODO: 如果配置缺失,需要一个色温使能的模式
ColorTemperatureModeOn: ColorTemperatureModeAuto,
}
}

Expand Down
Loading