diff --git a/src/DesktopMagic/DesktopMagic.csproj b/src/DesktopMagic/DesktopMagic.csproj index ed6c720..b11a26f 100644 --- a/src/DesktopMagic/DesktopMagic.csproj +++ b/src/DesktopMagic/DesktopMagic.csproj @@ -7,11 +7,11 @@ icon.ico OnBuildSuccess Stone_Red - 1.0.1.240501 + 1.0.2.0 https://github.com/Stone-Red-Code/DesktopMagic https://github.com/Stone-Red-Code/DesktopMagic - 1.0.1.0501 - 1.0.1.0501 + 1.0.2.0 + 1.0.2.0 net8.0-windows7.0 enable false @@ -38,8 +38,7 @@ - - + diff --git a/src/DesktopMagic/Helpers/SettingElementGenerator.cs b/src/DesktopMagic/Helpers/SettingElementGenerator.cs index 4c6e3ef..c4c7810 100644 --- a/src/DesktopMagic/Helpers/SettingElementGenerator.cs +++ b/src/DesktopMagic/Helpers/SettingElementGenerator.cs @@ -127,19 +127,22 @@ internal class SettingElementGenerator(ComboBox optionsComboBox) } else if (settingElement.Input is DesktopMagic.Api.Settings.IntegerUpDown eIntegerUpDown) { - Xceed.Wpf.Toolkit.IntegerUpDown integerUpDown = new() + MaterialDesignThemes.Wpf.NumericUpDown numericUpDown = new() { Value = eIntegerUpDown.Value, Minimum = eIntegerUpDown.Minimum, Maximum = eIntegerUpDown.Maximum, + IncreaseContent = new Label() { Content = "+" }, + DecreaseContent = new Label() { Content = "–" }, VerticalAlignment = VerticalAlignment.Center, - HorizontalAlignment = HorizontalAlignment.Stretch + HorizontalAlignment = HorizontalAlignment.Stretch, + AllowChangeOnScroll = true }; - integerUpDown.ValueChanged += (_s, _e) => + numericUpDown.ValueChanged += (_s, _e) => { try { - eIntegerUpDown.Value = integerUpDown.Value.GetValueOrDefault(); + eIntegerUpDown.Value = numericUpDown.Value; } catch (Exception ex) { @@ -148,12 +151,12 @@ internal class SettingElementGenerator(ComboBox optionsComboBox) }; eIntegerUpDown.OnValueChanged += () => { - integerUpDown.Dispatcher.Invoke(() => + numericUpDown.Dispatcher.Invoke(() => { - integerUpDown.Value = eIntegerUpDown.Value; + numericUpDown.Value = eIntegerUpDown.Value; }); }; - _ = dockPanel.Children.Add(integerUpDown); + _ = dockPanel.Children.Add(numericUpDown); } else if (settingElement.Input is DesktopMagic.Api.Settings.Slider eSlider) {