From Emil Ahlbäck <e.ahlback@xxxxxxxxx>:
Emil Ahlbäck has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2944 ;)
Change subject: Set input device for Trackpad settings
......................................................................
Set input device for Trackpad settings
Fixes #16267
---
M src/preferences/input/InputTouchpadPref.cpp
M src/preferences/input/InputTouchpadPref.h
M src/preferences/input/InputTouchpadPrefView.cpp
3 files changed, 12 insertions(+), 3 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/44/2944/1
diff --git a/src/preferences/input/InputTouchpadPref.cpp
b/src/preferences/input/InputTouchpadPref.cpp
index 8b31085..19164e6 100644
--- a/src/preferences/input/InputTouchpadPref.cpp
+++ b/src/preferences/input/InputTouchpadPref.cpp
@@ -62,6 +62,13 @@
return fTouchPad->Control(MS_SET_TOUCHPAD_SETTINGS, &msg);
}
+void
+TouchpadPref::SetDevice(BInputDevice *dev)
+{
+ delete fTouchPad;
+ fTouchPad = dev;
+}
+
void
TouchpadPref::Defaults()
@@ -136,4 +143,4 @@
}
return B_OK;
-}
\ No newline at end of file
+}
diff --git a/src/preferences/input/InputTouchpadPref.h
b/src/preferences/input/InputTouchpadPref.h
index fb1b67f..9f92a37 100644
--- a/src/preferences/input/InputTouchpadPref.h
+++ b/src/preferences/input/InputTouchpadPref.h
@@ -32,6 +32,7 @@
void Revert();
void Defaults();
+ void SetDevice(BInputDevice
*dev);
BPoint WindowPosition()
{
return fWindowPosition; }
@@ -55,4 +56,4 @@
};
-#endif // TOUCHPAD_PREF_H
\ No newline at end of file
+#endif // TOUCHPAD_PREF_H
diff --git a/src/preferences/input/InputTouchpadPrefView.cpp
b/src/preferences/input/InputTouchpadPrefView.cpp
index a3eeb2d..342a535 100644
--- a/src/preferences/input/InputTouchpadPrefView.cpp
+++ b/src/preferences/input/InputTouchpadPrefView.cpp
@@ -268,6 +268,7 @@
:
BGroupView()
{
+ fTouchpadPref.SetDevice(dev);
SetupView();
// set view values
SetValues(&fTouchpadPref.Settings());
@@ -484,4 +485,4 @@
fScrollStepYSlider->SetValue(20 - settings->scroll_ystepsize / 2);
fScrollAccelSlider->SetValue(settings->scroll_acceleration);
fTapSlider->SetValue(settings->tapgesture_sensibility);
-}
\ No newline at end of file
+}
--
To view, visit https://review.haiku-os.org/c/haiku/+/2944
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ica83b1ade623ce144b094cb6302de5d8ac0707d3
Gerrit-Change-Number: 2944
Gerrit-PatchSet: 1
Gerrit-Owner: Emil Ahlbäck <e.ahlback@xxxxxxxxx>
Gerrit-MessageType: newchange
