Skip to content

fix: add ConcatScreenName property for multi-screen display #1170

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.

Sign up for GitHub

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

Merged
deepin-bot merged 1 commit into from
Jul 9, 2026
Merged

fix: add ConcatScreenName property for multi-screen display #1170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions display1/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ type Manager struct {
HasChanged bool
DisplayMode byte
ConcatScreenEnabled bool
ConcatScreenName string
// dbusutil-gen: equal=nil
Brightness map[string]float64
CanSetBrightnessMap map[string]bool
Expand Down Expand Up @@ -2368,10 +2369,8 @@ func (m *Manager) applyConcatScreen() error {
}

m.PropsMu.Lock()
m.ConcatScreenEnabled = true
m.setConcatScreenEnabled(true, concatScreenName)
m.PropsMu.Unlock()

_ = m.service.EmitPropertyChanged(m, "ConcatScreenEnabled", true)
return nil
}

Expand All @@ -2386,13 +2385,22 @@ func (m *Manager) removeConcatScreen() error {
}

m.PropsMu.Lock()
m.ConcatScreenEnabled = false
m.setConcatScreenEnabled(false, "")
m.PropsMu.Unlock()

_ = m.service.EmitPropertyChanged(m, "ConcatScreenEnabled", false)
return nil
}

func (m *Manager) setConcatScreenEnabled(enabled bool, name string) (changed bool) {
if m.ConcatScreenEnabled != enabled {
m.ConcatScreenEnabled = enabled
m.ConcatScreenName = name
_ = m.service.EmitPropertyChanged(m, "ConcatScreenEnabled", enabled)
_ = m.service.EmitPropertyChanged(m, "ConcatScreenName", name)
return true
}
return false
}

func (m *Manager) save() (err error) {
if m.getInApply() {
logger.Debug("no save, in apply")
Expand Down
Loading