diff options
| -rw-r--r-- | grapher/Models/AccelGUI.cs | 10 | ||||
| -rw-r--r-- | grapher/Models/Options/AccelTypeOptions.cs | 4 | ||||
| -rw-r--r-- | grapher/Models/Serialized/SettingsManager.cs | 17 |
3 files changed, 16 insertions, 15 deletions
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 943360b..5a04030 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -249,16 +249,16 @@ namespace grapher private void OnToggleButtonClick(object sender, EventArgs e) { - var settings = ToggleButton.Checked ? - Settings.RawAccelSettings.AccelerationSettings : + var accel = ToggleButton.Checked ? + new ManagedAccel(Settings.RawAccelSettings.AccelerationSettings) : AccelTypeOptions.DefaultSettings; LastToggleChecked = ToggleButton.Checked; ButtonDelay(ToggleButton); - SettingsManager.SendToDriver(settings); - Settings.ActiveAccel.Settings = settings; - RefreshOnRead(settings); + SettingsManager.SendToDriver(accel); + Settings.ActiveAccel = accel; + RefreshOnRead(accel.Settings); } private void OnButtonTimerTick(object sender, EventArgs e) diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 0547164..aeada3f 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -22,7 +22,7 @@ namespace grapher new OffLayout() }.ToDictionary(k => k.Name); - public static readonly DriverSettings DefaultSettings = new DriverSettings(); + public static readonly ManagedAccel DefaultSettings = new ManagedAccel(); #endregion Fields @@ -228,7 +228,7 @@ namespace grapher public void SetArgs(ref AccelArgs args) { - AccelArgs defaults = DefaultSettings.args.x; + AccelArgs defaults = DefaultSettings.Settings.args.x; args.accelClassic = defaults.accelClassic; args.accelMotivity = defaults.accelMotivity; args.accelNatural = defaults.accelClassic; diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs index 1a57838..25aa534 100644 --- a/grapher/Models/Serialized/SettingsManager.cs +++ b/grapher/Models/Serialized/SettingsManager.cs @@ -34,7 +34,7 @@ namespace grapher.Models.Serialized #region Properties - public ManagedAccel ActiveAccel { get; } + public ManagedAccel ActiveAccel { get; set; } public RawAccelSettings RawAccelSettings { get; private set; } @@ -78,20 +78,21 @@ namespace grapher.Models.Serialized public SettingsErrors TryUpdateAccel(DriverSettings settings) { - var errors = SendToDriverSafe(settings); - if (errors.Empty()) ActiveAccel.Settings = settings; + var accel = new ManagedAccel(settings); + var errors = SendToDriverSafe(accel); + if (errors.Empty()) ActiveAccel= accel; return errors; } - public static void SendToDriver(DriverSettings settings) + public static void SendToDriver(ManagedAccel accel) { - new Thread(() => settings.ToFile()).Start(); + new Thread(() => accel.Activate()).Start(); } - public static SettingsErrors SendToDriverSafe(DriverSettings settings) + public static SettingsErrors SendToDriverSafe(ManagedAccel accel) { - var errors = new SettingsErrors(settings); - if (errors.Empty()) SendToDriver(settings); + var errors = new SettingsErrors(accel.Settings); + if (errors.Empty()) SendToDriver(accel); return errors; } |