summaryrefslogtreecommitdiff
path: root/grapher/Models/Serialized
diff options
context:
space:
mode:
authora1xd <[email protected]>2021-01-14 12:27:42 -0500
committerGitHub <[email protected]>2021-01-14 12:27:42 -0500
commit9ea8b4b94bba795eb5060b376baa8e5169e80272 (patch)
tree493bfaeb2b59b7db452c52e9ec9713e8b8296510 /grapher/Models/Serialized
parentMerge pull request #53 from termhn/patch-1 (diff)
parentfilter raw input based on id (diff)
downloadrawaccel-9ea8b4b94bba795eb5060b376baa8e5169e80272.tar.xz
rawaccel-9ea8b4b94bba795eb5060b376baa8e5169e80272.zip
Merge pull request #59 from aroidzap/apply-for-specific-device-gui
(GUI) Apply RawAccel only for specific device
Diffstat (limited to 'grapher/Models/Serialized')
-rw-r--r--grapher/Models/Serialized/RawAccelSettings.cs3
-rw-r--r--grapher/Models/Serialized/SettingsManager.cs8
2 files changed, 9 insertions, 2 deletions
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index dcaf864..f4fb1e2 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -125,7 +125,8 @@ namespace grapher.Models.Serialized
bool wholeOrNoY = accelSettings.combineMagnitudes ||
accelSettings.modes.y == AccelMode.noaccel;
- return accelSettings.sensitivity.x == 1 &&
+ return string.IsNullOrEmpty(accelSettings.deviceID) &&
+ accelSettings.sensitivity.x == 1 &&
accelSettings.sensitivity.y == 1 &&
accelSettings.directionalMultipliers.x <= 0 &&
accelSettings.directionalMultipliers.y <= 0 &&
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 41ebcb5..40652dd 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -3,6 +3,8 @@ using System;
using System.Windows.Forms;
using System.Threading;
using System.Text;
+using System.Drawing;
+using grapher.Models.Devices;
namespace grapher.Models.Serialized
{
@@ -16,7 +18,8 @@ namespace grapher.Models.Serialized
Field pollRateField,
ToolStripMenuItem autoWrite,
ToolStripMenuItem showLastMouseMove,
- ToolStripMenuItem showVelocityAndGain)
+ ToolStripMenuItem showVelocityAndGain,
+ DeviceIDManager deviceIDManager)
{
ActiveAccel = activeAccel;
DpiField = dpiField;
@@ -24,6 +27,7 @@ namespace grapher.Models.Serialized
AutoWriteMenuItem = autoWrite;
ShowLastMouseMoveMenuItem = showLastMouseMove;
ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
+ DeviceIDManager = deviceIDManager;
}
#endregion Constructors
@@ -38,6 +42,8 @@ namespace grapher.Models.Serialized
public Field PollRateField { get; private set; }
+ public DeviceIDManager DeviceIDManager { get; }
+
private ToolStripMenuItem AutoWriteMenuItem { get; set; }
private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; }