Stone_Red/DesktopMagic
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/DesktopMagic.git synced 2026-09-04 08:56:15 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Replace Xceed.Wpf.Toolkit.IntegerUpDown with MaterialDesignThemes.Wpf.NumericUpDown

Browse Source
This commit is contained in:
Stone_Red
2024-10-26 00:25:53 +02:00
parent d458feca1e
commit e545f27461
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DesktopMagic/DesktopMagic.csproj
+4 -5
View File
@@ -7,11 +7,11 @@
<ApplicationIcon>icon.ico</ApplicationIcon> <ApplicationIcon>icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<Authors>Stone_Red</Authors> <Authors>Stone_Red</Authors>
<Version>1.0.1.240501</Version> <Version>1.0.2.0</Version>
<PackageProjectUrl>https://github.com/Stone-Red-Code/DesktopMagic</PackageProjectUrl> <PackageProjectUrl>https://github.com/Stone-Red-Code/DesktopMagic</PackageProjectUrl>
<RepositoryUrl>https://github.com/Stone-Red-Code/DesktopMagic</RepositoryUrl> <RepositoryUrl>https://github.com/Stone-Red-Code/DesktopMagic</RepositoryUrl>
<AssemblyVersion>1.0.1.0501</AssemblyVersion> <AssemblyVersion>1.0.2.0</AssemblyVersion>
<FileVersion>1.0.1.0501</FileVersion> <FileVersion>1.0.2.0</FileVersion>
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>net8.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
@@ -38,8 +38,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BusyIndicators" Version="2.1.2" /> <PackageReference Include="BusyIndicators" Version="2.1.2" />
<PackageReference Include="CuteUtils" Version="1.0.0" /> <PackageReference Include="CuteUtils" Version="1.0.0" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" /> <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
<PackageReference Include="MaterialDesignThemes" Version="5.0.0" />
<PackageReference Include="Modio.NET" Version="1.1.1" /> <PackageReference Include="Modio.NET" Version="1.1.1" />
<PackageReference Include="NAudio" Version="2.2.1" /> <PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="System.Management" Version="8.0.0" /> <PackageReference Include="System.Management" Version="8.0.0" />
src/DesktopMagic/Helpers/SettingElementGenerator.cs
+10 -7
View File
@@ -127,19 +127,22 @@ internal class SettingElementGenerator(ComboBox optionsComboBox)
} }
else if (settingElement.Input is DesktopMagic.Api.Settings.IntegerUpDown eIntegerUpDown) else if (settingElement.Input is DesktopMagic.Api.Settings.IntegerUpDown eIntegerUpDown)
{ {
Xceed.Wpf.Toolkit.IntegerUpDown integerUpDown = new() MaterialDesignThemes.Wpf.NumericUpDown numericUpDown = new()
{ {
Value = eIntegerUpDown.Value, Value = eIntegerUpDown.Value,
Minimum = eIntegerUpDown.Minimum, Minimum = eIntegerUpDown.Minimum,
Maximum = eIntegerUpDown.Maximum, Maximum = eIntegerUpDown.Maximum,
IncreaseContent = new Label() { Content = "+" },
DecreaseContent = new Label() { Content = "–" },
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
HorizontalAlignment = HorizontalAlignment.Stretch HorizontalAlignment = HorizontalAlignment.Stretch,
AllowChangeOnScroll = true
}; };
integerUpDown.ValueChanged += (_s, _e) => numericUpDown.ValueChanged += (_s, _e) =>
{ {
try try
{ {
eIntegerUpDown.Value = integerUpDown.Value.GetValueOrDefault(); eIntegerUpDown.Value = numericUpDown.Value;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -148,12 +151,12 @@ internal class SettingElementGenerator(ComboBox optionsComboBox)
}; };
eIntegerUpDown.OnValueChanged += () => 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) else if (settingElement.Input is DesktopMagic.Api.Settings.Slider eSlider)
{ {