JacobTech.com/Luski
3
2
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Merge dev into main #18

Merged
JacobTech merged 5 commits from dev into main 2024-04-11 20:36:04 -04:00
Conversation 0 Commits 5 Files Changed 8 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0999d997cb - Show all commits

10
Luski/GUI/MainScreen/UI/SettingsMenu.cs
View File

@ -298,8 +298,6 @@ public class SettingsMenu : UserControl
}); });
TextBox t; TextBox t;
page!.Controls.Add(t =new TextBox() page!.Controls.Add(t =new TextBox()
{ {
@ -344,7 +342,7 @@ public class SettingsMenu : UserControl
{ {
var e = Enum.Parse(PropType, (v - va).ToString()); var e = Enum.Parse(PropType, (v - va).ToString());
PropVal = e; PropVal = e;
prop.SetValue(Globals.Settings, e); prop.SetValue(Globals.UpdaterSettings, e);
} }
Globals.UpdaterSettings.SaveSettings(Path.Combine(Globals.LuskiPath, "UpdaterSettings.json"), UpdaterSettingsContext.Default.UpdaterSettings); Globals.UpdaterSettings.SaveSettings(Path.Combine(Globals.LuskiPath, "UpdaterSettings.json"), UpdaterSettingsContext.Default.UpdaterSettings);
}); });
@ -364,7 +362,7 @@ public class SettingsMenu : UserControl
string description = ((DescriptionAttribute)valueAttributes[0]).Description; string description = ((DescriptionAttribute)valueAttributes[0]).Description;
AddBool(description, (bool)PropVal, b => AddBool(description, (bool)PropVal, b =>
{ {
prop.SetValue(Globals.Settings, b); prop.SetValue(Globals.UpdaterSettings, b);
Globals.UpdaterSettings.SaveSettings(Path.Combine(Globals.LuskiPath, "UpdaterSettings.json"), UpdaterSettingsContext.Default.UpdaterSettings); Globals.UpdaterSettings.SaveSettings(Path.Combine(Globals.LuskiPath, "UpdaterSettings.json"), UpdaterSettingsContext.Default.UpdaterSettings);
}); });
} }
@ -373,6 +371,7 @@ public class SettingsMenu : UserControl
// ignored // ignored
} }
} }
} }
t.ForceDistanceUpdate(page); t.ForceDistanceUpdate(page);
@ -382,7 +381,8 @@ public class SettingsMenu : UserControl
Globals.UpdaterSettings.SaveSettings(Path.Combine(Globals.LuskiPath, "UpdaterSettings.json"), UpdaterSettingsContext.Default.UpdaterSettings); Globals.UpdaterSettings.SaveSettings(Path.Combine(Globals.LuskiPath, "UpdaterSettings.json"), UpdaterSettingsContext.Default.UpdaterSettings);
return Task.CompletedTask; return Task.CompletedTask;
}; };
Globals.ms.ForceUpdate(new(Globals.ms.ClientSize)); TryDraw();
Globals.ms.ForceUpdate(new(Globals.ms.CS));
} }
}; };
As.AddButton(cb); As.AddButton(cb);