fix: 解决禁用触控板无法禁用的问题

解决禁用触控板无法禁用的问题 Log: 解决禁用触控板无法禁用的问题 pms: BUG-295823
linuxdeepin · Dec 18, 2024 · 91703b2 · 91703b2
1 parent c94147b
commit 91703b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/inputdevices1/mouse.go b/inputdevices1/mouse.go
@@ -86,7 +86,7 @@ func (m *Mouse) init() {
 	tpad := m.touchPad
 
 	if !m.Exist {
-		if tpad.Exist && !tpad.TPadEnable.Get() {
+		if tpad.Exist && tpad.TPadEnable.Get() {
 			tpad.enable(true)
 		}
 		return

diff --git a/inputdevices1/touchpad.go b/inputdevices1/touchpad.go
@@ -244,6 +244,9 @@ func (tpad *Touchpad) updateDXTpads() {
 }
 
 func (tpad *Touchpad) enable(enabled bool) {
+	if enabled == tpad.TPadEnable.Get() {
+		return
+	}
 	if len(tpad.devInfos) > 0 {
 		for _, v := range tpad.devInfos {
 			err := v.Enable(enabled)
@@ -256,6 +259,12 @@ func (tpad *Touchpad) enable(enabled bool) {
 
 	enableGesture(enabled)
 	tpad.TPadEnable.Set(enabled)
+	sysTouchPad, err := inputdevices.NewTouchpad(tpad.systemConn, "/org/deepin/dde/InputDevices1/Touchpad")
+	if err == nil && sysTouchPad != nil {
+		if err = sysTouchPad.SetTouchpadEnable(0, enabled); err != nil {
+			logger.Warning(err)
+		}
+	}
 }
 
 func (tpad *Touchpad) enableLeftHanded() {