Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

fix: stupid warnings in NumberBox

fatDuckd7a4663792e6
diff --git a/optimizerDuck/Common/Converters/ObjectToNullableDoubleConverter.cs b/optimizerDuck/Common/Converters/ObjectToNullableDoubleConverter.cs
new file mode 100644
index 0000000..a4dae83
--- /dev/null
+++ b/optimizerDuck/Common/Converters/ObjectToNullableDoubleConverter.cs
@@ -0,0 +1,99 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace optimizerDuck.Common.Converters;
+
+public sealed class ObjectToNullableDoubleConverter : IValueConverter
+{
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is null)
+ return null;
+
+ if (value is double d)
+ return d;
+
+ if (value is float f)
+ return (double)f;
+
+ if (value is int i)
+ return (double)i;
+
+ if (value is long l)
+ return (double)l;
+
+ if (value is short sh)
+ return (double)sh;
+
+ if (value is byte b)
+ return (double)b;
+
+ if (value is decimal dec)
+ return (double)dec;
+
+ if (value is string s)
+ {
+ if (double.TryParse(s, NumberStyles.Any, culture, out var parsed))
+ return parsed;
+ return DependencyProperty.UnsetValue;
+ }
+
+ if (value.GetType() == typeof(object))
+ return null;
+
+ if (value is bool)
+ return DependencyProperty.UnsetValue;
+
+ if (value is IConvertible convertible)
+ {
+ try
+ {
+ return System.Convert.ToDouble(convertible, culture);
+ }
+ catch
+ {
+ return DependencyProperty.UnsetValue;
+ }
+ }
+
+ return DependencyProperty.UnsetValue;
+ }
+
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is null)
+ return null;
+
+ var isInt =
+ parameter is string p && p.Equals("Int", StringComparison.OrdinalIgnoreCase);
+
+ if (value is double db)
+ return isInt ? (int)Math.Round(db) : db;
+
+ if (value is float fb)
+ return isInt ? (int)Math.Round(fb) : (double)fb;
+
+ if (value is string str)
+ {
+ if (string.IsNullOrWhiteSpace(str))
+ return null;
+
+ if (isInt)
+ {
+ if (int.TryParse(str, NumberStyles.Any, culture, out var intParsed))
+ return intParsed;
+ if (double.TryParse(str, NumberStyles.Any, culture, out var dblParsed))
+ return (int)Math.Round(dblParsed);
+ return DependencyProperty.UnsetValue;
+ }
+
+ if (double.TryParse(str, NumberStyles.Any, culture, out var dbl))
+ return dbl;
+
+ return DependencyProperty.UnsetValue;
+ }
+
+ return value;
+ }
+}
diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
index 8be5baa..f6cb9eb 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
@@ -153,6 +153,11 @@
</StackPanel>
</Border>
+ <ui:TextBlock
+ Margin="0,0,0,8"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.TechnicalDetails}" />
+
<Border
Margin="0,0,0,12"
Padding="0"
diff --git a/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPage.xaml b/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPage.xaml
index f0b0601..0938485 100644
--- a/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPage.xaml
+++ b/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPage.xaml
@@ -21,6 +21,7 @@
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
<converters:EqualityToVisibilityConverter x:Key="EqualityToVisibilityConverter" />
<converters:RecommendationForegroundConverter x:Key="RecommendationForegroundConverter" />
+ <converters:ObjectToNullableDoubleConverter x:Key="ObjectToNullableDoubleConverter" />
<Style x:Key="RecommendationForegroundTextBlockStyle" TargetType="ui:TextBlock">
<Setter Property="Foreground">
@@ -179,12 +180,12 @@
MinWidth="120"
VerticalAlignment="Center"
Visibility="{Binding ControlType, Converter={StaticResource EqualityToVisibilityConverter}, ConverterParameter={x:Static models:CustomizeControlType.NumberInt}}"
- Value="{Binding CurrentValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" />
+ Value="{Binding CurrentValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus, Converter={StaticResource ObjectToNullableDoubleConverter}, ConverterParameter=Int}" />
<ui:NumberBox
MinWidth="120"
VerticalAlignment="Center"
Visibility="{Binding ControlType, Converter={StaticResource EqualityToVisibilityConverter}, ConverterParameter={x:Static models:CustomizeControlType.NumberFloat}}"
- Value="{Binding CurrentValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" />
+ Value="{Binding CurrentValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus, Converter={StaticResource ObjectToNullableDoubleConverter}}" />
<!-- String Control -->
<TextBox
MinWidth="160"
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
index f198048..f81e6c2 100644
--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
@@ -44,7 +44,7 @@
<!-- Main Content -->
<Grid RowDefinitions="Auto,*" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
<!-- Toolbar -->
- <Border Grid.Row="0" Style="{StaticResource ToolbarSurfaceStyle}" Padding="8,6">
+ <Border Grid.Row="0" Style="{StaticResource ToolbarSurfaceStyle}">
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
<!-- Search -->
<ui:TextBox
@@ -223,7 +223,7 @@
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource CornerRadiusMedium}">
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<Grid>
<!-- Unsupported compatibility state -->
<Grid RowDefinitions="Auto, Auto, Auto, Auto, *" Visibility="{Binding IsConditionBlocked, Converter={StaticResource BooleanToVisibilityConverter}}">
diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xaml
index dc9ce76..9328c12 100644
--- a/optimizerDuck/UI/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml
@@ -20,6 +20,7 @@
<Page.Resources>
<converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />
<converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />
+ <converters:ObjectToNullableDoubleConverter x:Key="ObjectToNullableDoubleConverter" />
</Page.Resources>
<ScrollViewer>
@@ -120,7 +121,7 @@
<ui:NumberBox
Minimum="1000"
SmallChange="1000"
- Value="{Binding ViewModel.ShellTimeoutMs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+ Value="{Binding ViewModel.ShellTimeoutMs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource ObjectToNullableDoubleConverter}, ConverterParameter=Int}" />
</ui:CardControl>
<ui:CardControl Margin="0,0,0,4" Icon="{ui:SymbolIcon Alert24}">
diff --git a/optimizerDuck/UI/Styles/FluentDesign.xaml b/optimizerDuck/UI/Styles/FluentDesign.xaml
index afc17e5..5361147 100644
--- a/optimizerDuck/UI/Styles/FluentDesign.xaml
+++ b/optimizerDuck/UI/Styles/FluentDesign.xaml
@@ -14,7 +14,7 @@
<Thickness x:Key="SectionTopMargin">0,12,0,0</Thickness>
<Thickness x:Key="CardPadding">16,14</Thickness>
<Thickness x:Key="ListRowPadding">16,12</Thickness>
- <Thickness x:Key="ToolbarPadding">16,12</Thickness>
+ <Thickness x:Key="ToolbarPadding">8,6</Thickness>
<Thickness x:Key="ControlGap">0,0,8,0</Thickness>
<Thickness x:Key="RowGap">0,0,0,8</Thickness>
@@ -68,7 +68,7 @@
<Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />
<Setter Property="BorderThickness" Value="1" />
- <Setter Property="CornerRadius" Value="{StaticResource CornerRadiusLarge}" />
+ <Setter Property="CornerRadius" Value="{StaticResource CornerRadiusSmall}" />
</Style>
<Style x:Key="CardSurfaceStyle" TargetType="Border">