Use native UpdateSourceTrigger=LostFocus instead of the behavior wo…

…rkaround
Tyrrrz · Aug 23, 2024 · 9b5ec39 · 9b5ec39
1 parent d64896c
commit 9b5ec39
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 108 deletions.
diff --git a/LightBulb/Behaviors/LostFocusUpdateBindingBehavior.cs b/LightBulb/Behaviors/LostFocusUpdateBindingBehavior.cs
diff --git a/LightBulb/LightBulb.csproj b/LightBulb/LightBulb.csproj
@@ -21,7 +21,6 @@
     <PackageReference Include="Avalonia" Version="11.1.1" />
     <PackageReference Include="Avalonia.Desktop" Version="11.1.1" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.1.1" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0" />
     <PackageReference Include="Cogwheel" Version="2.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="CSharpier.MsBuild" Version="0.28.2" PrivateAssets="all" />

diff --git a/LightBulb/Views/Components/Settings/GeneralSettingsTabView.axaml b/LightBulb/Views/Components/Settings/GeneralSettingsTabView.axaml
@@ -2,7 +2,6 @@
     x:Class="LightBulb.Views.Components.Settings.GeneralSettingsTabView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:behaviors="clr-namespace:LightBulb.Behaviors"
     xmlns:converters="clr-namespace:LightBulb.Converters"
     xmlns:settings="clr-namespace:LightBulb.ViewModels.Components.Settings"
     x:DataType="settings:GeneralSettingsTabViewModel">
@@ -14,11 +13,8 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}">
-                <Interaction.Behaviors>
-                    <behaviors:LostFocusUpdateBindingBehavior Text="{Binding DayTemperature, Converter={x:Static converters:DoubleToStringConverter.Instance}}" />
-                </Interaction.Behaviors>
-            </TextBox>
+                Text="{Binding DayTemperature, Converter={x:Static converters:DoubleToStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                Theme="{DynamicResource CompactTextBox}" />
         </DockPanel>
         <Slider
             Margin="0,12,0,0"
@@ -37,11 +33,8 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}">
-                <Interaction.Behaviors>
-                    <behaviors:LostFocusUpdateBindingBehavior Text="{Binding NightTemperature, Converter={x:Static converters:DoubleToStringConverter.Instance}}" />
-                </Interaction.Behaviors>
-            </TextBox>
+                Text="{Binding NightTemperature, Converter={x:Static converters:DoubleToStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                Theme="{DynamicResource CompactTextBox}" />
         </DockPanel>
         <Slider
             Margin="0,12,0,0"
@@ -73,11 +66,8 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}">
-                <Interaction.Behaviors>
-                    <behaviors:LostFocusUpdateBindingBehavior Text="{Binding DayBrightness, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}}" />
-                </Interaction.Behaviors>
-            </TextBox>
+                Text="{Binding DayBrightness, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                Theme="{DynamicResource CompactTextBox}" />
         </DockPanel>
         <Slider
             Margin="0,12,0,0"
@@ -109,11 +99,8 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}">
-                <Interaction.Behaviors>
-                    <behaviors:LostFocusUpdateBindingBehavior Text="{Binding NightBrightness, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}}" />
-                </Interaction.Behaviors>
-            </TextBox>
+                Text="{Binding NightBrightness, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                Theme="{DynamicResource CompactTextBox}" />
         </DockPanel>
         <Slider
             Margin="0,12,0,0"
@@ -132,11 +119,8 @@
                 MinWidth="48"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}">
-                <Interaction.Behaviors>
-                    <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ConfigurationTransitionDuration, Converter={x:Static converters:TimeSpanToDurationStringConverter.Instance}}" />
-                </Interaction.Behaviors>
-            </TextBox>
+                Text="{Binding ConfigurationTransitionDuration, Converter={x:Static converters:TimeSpanToDurationStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                Theme="{DynamicResource CompactTextBox}" />
         </DockPanel>
         <Slider
             Margin="0,12,0,0"
@@ -153,11 +137,8 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}">
-                <Interaction.Behaviors>
-                    <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ConfigurationTransitionOffset, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}}" />
-                </Interaction.Behaviors>
-            </TextBox>
+                Text="{Binding ConfigurationTransitionOffset, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                Theme="{DynamicResource CompactTextBox}" />
         </DockPanel>
         <Slider
             Margin="0,12,0,0"

diff --git a/LightBulb/Views/Components/Settings/LocationSettingsTabView.axaml b/LightBulb/Views/Components/Settings/LocationSettingsTabView.axaml
@@ -2,7 +2,6 @@
     x:Class="LightBulb.Views.Components.Settings.LocationSettingsTabView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:behaviors="clr-namespace:LightBulb.Behaviors"
     xmlns:converters="clr-namespace:LightBulb.Converters"
     xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:settings="clr-namespace:LightBulb.ViewModels.Components.Settings"
@@ -36,11 +35,8 @@
                     MinWidth="24"
                     HorizontalAlignment="Right"
                     DockPanel.Dock="Right"
-                    Theme="{DynamicResource CompactTextBox}">
-                    <Interaction.Behaviors>
-                        <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ManualSunrise, Converter={x:Static converters:TimeOnlyToStringConverter.Instance}}" />
-                    </Interaction.Behaviors>
-                </TextBox>
+                    Text="{Binding ManualSunrise, Converter={x:Static converters:TimeOnlyToStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                    Theme="{DynamicResource CompactTextBox}" />
             </DockPanel>
             <Slider
                 Margin="0,12,0,0"
@@ -57,11 +53,8 @@
                     MinWidth="24"
                     HorizontalAlignment="Right"
                     DockPanel.Dock="Right"
-                    Theme="{DynamicResource CompactTextBox}">
-                    <Interaction.Behaviors>
-                        <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ManualSunset, Converter={x:Static converters:TimeOnlyToStringConverter.Instance}}" />
-                    </Interaction.Behaviors>
-                </TextBox>
+                    Text="{Binding ManualSunset, Converter={x:Static converters:TimeOnlyToStringConverter.Instance}, UpdateSourceTrigger=LostFocus}"
+                    Theme="{DynamicResource CompactTextBox}" />
             </DockPanel>
             <Slider
                 Margin="0,12,0,0"