rever winappsdk update

insomniachi · Mar 11, 2024 · ad8c82e · ad8c82e
1 parent 4869331
commit ad8c82e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 88 deletions.
diff --git a/Totoro.WinUI/Behaviors/SelectorBarBehavior.cs b/Totoro.WinUI/Behaviors/SelectorBarBehavior.cs
diff --git a/Totoro.WinUI/Totoro.WinUI.csproj b/Totoro.WinUI/Totoro.WinUI.csproj
@@ -39,22 +39,22 @@
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Layout" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
-		<PackageReference Include="FlyleafLib.Controls.WinUI" Version="1.0.26" />
+		<PackageReference Include="FlyleafLib.Controls.WinUI" Version="1.0.21" />
 
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.0.124" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
 		<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="ReactiveUI" Version="19.5.41" />
-		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
-		<PackageReference Include="ReactiveUI.WinUI" Version="19.5.41" />
+		<PackageReference Include="ReactiveUI" Version="19.5.39" />
+		<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
+		<PackageReference Include="ReactiveUI.WinUI" Version="19.5.39" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
-		<PackageReference Include="WinUIEx" Version="2.3.4" />
+		<PackageReference Include="WinUIEx" Version="2.3.3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Totoro.WinUI/UserControls/PivotNavigation.xaml b/Totoro.WinUI/UserControls/PivotNavigation.xaml
@@ -2,25 +2,40 @@
     x:Class="Totoro.WinUI.UserControls.PivotNavigation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:b="using:Totoro.WinUI.Behaviors"
+    xmlns:ctk="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Margin="0,30"
     mc:Ignorable="d">
 
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
 
-        <SelectorBar>
-            <Interactivity:Interaction.Behaviors>
-                <b:SelectorBarBehavior ItemSource="{x:Bind ItemSource, Mode=OneWay}" SelectedItem="{x:Bind SelectedItem, Mode=TwoWay}" />
-            </Interactivity:Interaction.Behaviors>
-        </SelectorBar>
+        <ctk:Segmented
+            DisplayMemberPath="Header"
+            ItemsSource="{x:Bind ItemSource, Mode=OneWay}"
+            SelectedIndex="0"
+            SelectedItem="{x:Bind SelectedItem, Mode=TwoWay}"
+            Style="{StaticResource PivotSegmentedStyle}">
+            <ctk:Segmented.ItemContainerStyle>
+                <Style BasedOn="{StaticResource PivotSegmentedItemStyle}" TargetType="ctk:SegmentedItem">
+                    <Setter Property="FontSize" Value="20" />
+                </Style>
+            </ctk:Segmented.ItemContainerStyle>
+        </ctk:Segmented>
 
         <Frame x:Name="NavFrame" Grid.Row="1" />
+
     </Grid>
 </UserControl>