Skip to content

Commit 02d4ff2

Browse files
committed
fix: 设置手势的动作后,发送infos变化的信号
设置手势的动作后,发送infos变化的信号 Log: 设置手势的动作后,发送infos变化的信号 pms: TASK-362119
1 parent b28541e commit 02d4ff2

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

gesture1/daemon.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@ func (d *Daemon) Start() error {
4242
if d.manager != nil {
4343
return nil
4444
}
45-
45+
service := loader.GetService()
4646
var err error
47-
d.manager, err = newManager()
47+
d.manager, err = newManager(service)
4848
if err != nil {
4949
logger.Error("failed to initialize gesture manager:", err)
5050
return err
5151
}
5252

53-
service := loader.GetService()
5453
err = service.Export(dbusServicePath, d.manager)
5554
if err != nil {
5655
logger.Error("failed to export gesture:", err)

gesture1/gesture1_dbusutil.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gesture1/manager.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func setUseWayland(value bool) {
6363

6464
type Manager struct {
6565
wm wm.Wm
66+
service *dbusutil.Service
6667
sysDaemon daemon.Daemon
6768
systemSigLoop *dbusutil.SignalLoop
6869
mu sync.RWMutex
@@ -91,7 +92,7 @@ type Manager struct {
9192
availableGestures map[string][]string
9293
}
9394

94-
func newManager() (*Manager, error) {
95+
func newManager(service *dbusutil.Service) (*Manager, error) {
9596
setUseWayland(len(os.Getenv("WAYLAND_DISPLAY")) != 0)
9697
sessionConn, err := dbus.SessionBus()
9798
if err != nil {
@@ -127,6 +128,7 @@ func newManager() (*Manager, error) {
127128
notification: notification.NewNotification(sessionConn),
128129
launchpad: launchpad.NewLauncher(sessionConn),
129130
availableGestures: make(map[string][]string),
131+
service: service,
130132
}
131133
dsg := configManager.NewConfigManager(systemConn)
132134
powerConfigManagerPath, err := dsg.AcquireManager(0, "org.deepin.dde.daemon", "org.deepin.dde.daemon.gesture", "")

gesture1/manager_ifc.go

+4
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ func (m *Manager) SetGesture(name string, direction string, fingers int32, actio
116116
gesture.Direction == direction &&
117117
gesture.Fingers == fingers {
118118
gesture.ActionName = action
119+
err := m.emitPropChangedInfos(m.Infos)
120+
if err != nil {
121+
logger.Warning(err)
122+
}
119123
m.saveGestureConfig()
120124
break
121125
}

0 commit comments

Comments
 (0)