Skip to content

Commit c836c1d

Browse files
hez2010hez2010
committed
Bye bye Microsoft.Xaml.Interactions.Core
1 parent 5390298 commit c836c1d

File tree

14 files changed

+83
-93
lines changed

14 files changed

+83
-93
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
2727
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
2828
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
29+
<PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
2930
<PackageVersion Include="Sentry" Version="5.1.0" />
3031
<PackageVersion Include="SevenZipSharp" Version="1.0.2" />
3132
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />

‎src/Files.App/Dialogs/DynamicDialog.xaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:helpers="using:Files.App.Helpers"
88
xmlns:i="using:Microsoft.Xaml.Interactivity"
9-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
109
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1110
Title="{x:Bind ViewModel.TitleText, Mode=OneWay}"
1211
CloseButtonClick="ContentDialog_CloseButtonClick"
@@ -53,9 +52,9 @@
5352
Content="{x:Bind ViewModel.DisplayControl, Mode=OneWay}">
5453
<i:Interaction.Behaviors>
5554
<!-- No need to specify CommandParameter - `e` is passed by default -->
56-
<icore:EventTriggerBehavior EventName="Loaded">
57-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.DisplayControlOnLoadedCommand, Mode=OneWay}" />
58-
</icore:EventTriggerBehavior>
55+
<i:EventTriggerBehavior EventName="Loaded">
56+
<i:InvokeCommandAction Command="{x:Bind ViewModel.DisplayControlOnLoadedCommand, Mode=OneWay}" />
57+
</i:EventTriggerBehavior>
5958
</i:Interaction.Behaviors>
6059
</ContentControl>
6160

‎src/Files.App/Files.App.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<PackageReference Include="Microsoft.Extensions.Hosting" />
8484
<PackageReference Include="Microsoft.Extensions.Logging" />
8585
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
86+
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
8687
<PackageReference Include="Sentry" />
8788
<PackageReference Include="SevenZipSharp" />
8889
<PackageReference Include="SQLitePCLRaw.bundle_green" />

‎src/Files.App/UserControls/PathBreadcrumb.xaml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
x:Class="Files.App.UserControls.PathBreadcrumb"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:core="using:Microsoft.Xaml.Interactions.Core"
76
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
87
xmlns:dataitem="using:Files.App.Data.Items"
98
xmlns:i="using:Microsoft.Xaml.Interactivity"
@@ -34,12 +33,12 @@
3433
Spacing="4"
3534
Tag="{x:Bind Path, Mode=OneWay}">
3635
<i:Interaction.Behaviors>
37-
<core:EventTriggerBehavior EventName="PointerEntered">
38-
<core:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
39-
</core:EventTriggerBehavior>
40-
<core:EventTriggerBehavior EventName="PointerExited">
41-
<core:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
42-
</core:EventTriggerBehavior>
36+
<i:EventTriggerBehavior EventName="PointerEntered">
37+
<i:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
38+
</i:EventTriggerBehavior>
39+
<i:EventTriggerBehavior EventName="PointerExited">
40+
<i:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
41+
</i:EventTriggerBehavior>
4342
</i:Interaction.Behaviors>
4443

4544
<!-- Header -->
@@ -74,12 +73,12 @@
7473
Tapped="PathBoxItem_Tapped"
7574
Text="{x:Bind Title, Mode=OneWay}">
7675
<i:Interaction.Behaviors>
77-
<core:EventTriggerBehavior EventName="PointerEntered">
78-
<core:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
79-
</core:EventTriggerBehavior>
80-
<core:EventTriggerBehavior EventName="PointerExited">
81-
<core:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
82-
</core:EventTriggerBehavior>
76+
<i:EventTriggerBehavior EventName="PointerEntered">
77+
<i:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
78+
</i:EventTriggerBehavior>
79+
<i:EventTriggerBehavior EventName="PointerExited">
80+
<i:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
81+
</i:EventTriggerBehavior>
8382
</i:Interaction.Behaviors>
8483
</TextBlock>
8584

‎src/Files.App/Views/HomePage.xaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
xmlns:dataitems="using:Files.App.Data.Items"
99
xmlns:helpers="using:Files.App.Helpers"
1010
xmlns:i="using:Microsoft.Xaml.Interactivity"
11-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
1211
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1312
DataContext="{x:Bind ViewModel, Mode=OneWay}"
1413
mc:Ignorable="d">
1514

1615
<i:Interaction.Behaviors>
17-
<icore:EventTriggerBehavior EventName="Loaded">
18-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.HomePageLoadedCommand, Mode=OneWay}" />
19-
</icore:EventTriggerBehavior>
16+
<i:EventTriggerBehavior EventName="Loaded">
17+
<i:InvokeCommandAction Command="{x:Bind ViewModel.HomePageLoadedCommand, Mode=OneWay}" />
18+
</i:EventTriggerBehavior>
2019
</i:Interaction.Behaviors>
2120

2221
<UserControl.Resources>

‎src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
xmlns:controls="using:Files.App.Controls"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:i="using:Microsoft.Xaml.Interactivity"
9-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
109
xmlns:local="using:Files.App.Views.Layouts"
1110
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1211
x:Name="PageRoot"
1312
HighContrastAdjustment="None"
1413
mc:Ignorable="d">
1514

1615
<i:Interaction.Behaviors>
17-
<icore:EventTriggerBehavior EventName="PointerPressed">
18-
<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
19-
</icore:EventTriggerBehavior>
16+
<i:EventTriggerBehavior EventName="PointerPressed">
17+
<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
18+
</i:EventTriggerBehavior>
2019
</i:Interaction.Behaviors>
2120

2221
<local:BaseLayoutPage.Resources>

‎src/Files.App/Views/Layouts/DetailsLayoutPage.xaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
xmlns:filesystem="using:Files.App.Utils"
1212
xmlns:helpers="using:Files.App.Helpers"
1313
xmlns:i="using:Microsoft.Xaml.Interactivity"
14-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
1514
xmlns:local="using:Files.App.Views.Layouts"
1615
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1716
xmlns:storage="using:Files.App.Utils.Storage"
@@ -24,12 +23,12 @@
2423
mc:Ignorable="d">
2524

2625
<i:Interaction.Behaviors>
27-
<icore:EventTriggerBehavior EventName="PointerWheelChanged">
28-
<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
29-
</icore:EventTriggerBehavior>
30-
<icore:EventTriggerBehavior EventName="PointerPressed">
31-
<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
32-
</icore:EventTriggerBehavior>
26+
<i:EventTriggerBehavior EventName="PointerWheelChanged">
27+
<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
28+
</i:EventTriggerBehavior>
29+
<i:EventTriggerBehavior EventName="PointerPressed">
30+
<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
31+
</i:EventTriggerBehavior>
3332
</i:Interaction.Behaviors>
3433

3534
<local:BaseGroupableLayoutPage.Resources>

‎src/Files.App/Views/Layouts/GridLayoutPage.xaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
xmlns:filesystem="using:Files.App.Utils"
1212
xmlns:helpers="using:Files.App.Helpers"
1313
xmlns:i="using:Microsoft.Xaml.Interactivity"
14-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
1514
xmlns:local="using:Files.App.Views.Layouts"
1615
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1716
xmlns:storage="using:Files.App.Utils.Storage"
@@ -24,12 +23,12 @@
2423
mc:Ignorable="d">
2524

2625
<i:Interaction.Behaviors>
27-
<icore:EventTriggerBehavior EventName="PointerWheelChanged">
28-
<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
29-
</icore:EventTriggerBehavior>
30-
<icore:EventTriggerBehavior EventName="PointerPressed">
31-
<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
32-
</icore:EventTriggerBehavior>
26+
<i:EventTriggerBehavior EventName="PointerWheelChanged">
27+
<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
28+
</i:EventTriggerBehavior>
29+
<i:EventTriggerBehavior EventName="PointerPressed">
30+
<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
31+
</i:EventTriggerBehavior>
3332
</i:Interaction.Behaviors>
3433

3534
<local:BaseGroupableLayoutPage.Resources>

‎src/Files.App/Views/MainPage.xaml‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
99
xmlns:helpers="using:Files.App.Helpers"
1010
xmlns:i="using:Microsoft.Xaml.Interactivity"
11-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
1211
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1312
xmlns:sidebar="using:Files.App.UserControls.Sidebar"
1413
xmlns:tabbar="using:Files.App.UserControls.TabBar"
@@ -56,65 +55,65 @@
5655
<Page.KeyboardAccelerators>
5756
<KeyboardAccelerator Key="Number1" Modifiers="Control">
5857
<i:Interaction.Behaviors>
59-
<icore:EventTriggerBehavior EventName="Invoked">
60-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
61-
</icore:EventTriggerBehavior>
58+
<i:EventTriggerBehavior EventName="Invoked">
59+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
60+
</i:EventTriggerBehavior>
6261
</i:Interaction.Behaviors>
6362
</KeyboardAccelerator>
6463
<KeyboardAccelerator Key="Number2" Modifiers="Control">
6564
<i:Interaction.Behaviors>
66-
<icore:EventTriggerBehavior EventName="Invoked">
67-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
68-
</icore:EventTriggerBehavior>
65+
<i:EventTriggerBehavior EventName="Invoked">
66+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
67+
</i:EventTriggerBehavior>
6968
</i:Interaction.Behaviors>
7069
</KeyboardAccelerator>
7170
<KeyboardAccelerator Key="Number3" Modifiers="Control">
7271
<i:Interaction.Behaviors>
73-
<icore:EventTriggerBehavior EventName="Invoked">
74-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
75-
</icore:EventTriggerBehavior>
72+
<i:EventTriggerBehavior EventName="Invoked">
73+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
74+
</i:EventTriggerBehavior>
7675
</i:Interaction.Behaviors>
7776
</KeyboardAccelerator>
7877
<KeyboardAccelerator Key="Number4" Modifiers="Control">
7978
<i:Interaction.Behaviors>
80-
<icore:EventTriggerBehavior EventName="Invoked">
81-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
82-
</icore:EventTriggerBehavior>
79+
<i:EventTriggerBehavior EventName="Invoked">
80+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
81+
</i:EventTriggerBehavior>
8382
</i:Interaction.Behaviors>
8483
</KeyboardAccelerator>
8584
<KeyboardAccelerator Key="Number5" Modifiers="Control">
8685
<i:Interaction.Behaviors>
87-
<icore:EventTriggerBehavior EventName="Invoked">
88-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
89-
</icore:EventTriggerBehavior>
86+
<i:EventTriggerBehavior EventName="Invoked">
87+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
88+
</i:EventTriggerBehavior>
9089
</i:Interaction.Behaviors>
9190
</KeyboardAccelerator>
9291
<KeyboardAccelerator Key="Number6" Modifiers="Control">
9392
<i:Interaction.Behaviors>
94-
<icore:EventTriggerBehavior EventName="Invoked">
95-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
96-
</icore:EventTriggerBehavior>
93+
<i:EventTriggerBehavior EventName="Invoked">
94+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
95+
</i:EventTriggerBehavior>
9796
</i:Interaction.Behaviors>
9897
</KeyboardAccelerator>
9998
<KeyboardAccelerator Key="Number7" Modifiers="Control">
10099
<i:Interaction.Behaviors>
101-
<icore:EventTriggerBehavior EventName="Invoked">
102-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
103-
</icore:EventTriggerBehavior>
100+
<i:EventTriggerBehavior EventName="Invoked">
101+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
102+
</i:EventTriggerBehavior>
104103
</i:Interaction.Behaviors>
105104
</KeyboardAccelerator>
106105
<KeyboardAccelerator Key="Number8" Modifiers="Control">
107106
<i:Interaction.Behaviors>
108-
<icore:EventTriggerBehavior EventName="Invoked">
109-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
110-
</icore:EventTriggerBehavior>
107+
<i:EventTriggerBehavior EventName="Invoked">
108+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
109+
</i:EventTriggerBehavior>
111110
</i:Interaction.Behaviors>
112111
</KeyboardAccelerator>
113112
<KeyboardAccelerator Key="Number9" Modifiers="Control">
114113
<i:Interaction.Behaviors>
115-
<icore:EventTriggerBehavior EventName="Invoked">
116-
<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
117-
</icore:EventTriggerBehavior>
114+
<i:EventTriggerBehavior EventName="Invoked">
115+
<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
116+
</i:EventTriggerBehavior>
118117
</i:Interaction.Behaviors>
119118
</KeyboardAccelerator>
120119
</Page.KeyboardAccelerators>

‎src/Files.App/Views/Properties/GeneralPage.xaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
x:Class="Files.App.Views.Properties.GeneralPage"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
7-
xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
6+
xmlns:i="using:Microsoft.Xaml.Interactivity"
87
xmlns:controls="using:Files.App.UserControls.Settings"
98
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
109
xmlns:helpers="using:Files.App.Helpers"
@@ -120,14 +119,14 @@
120119
Glyph="&#xE70F;" />
121120
</Border>
122121

123-
<Interactivity:Interaction.Behaviors>
124-
<Core:EventTriggerBehavior EventName="PointerEntered">
125-
<Core:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
126-
</Core:EventTriggerBehavior>
127-
<Core:EventTriggerBehavior EventName="PointerExited">
128-
<Core:ChangePropertyAction PropertyName="Opacity" Value="0" />
129-
</Core:EventTriggerBehavior>
130-
</Interactivity:Interaction.Behaviors>
122+
<i:Interaction.Behaviors>
123+
<i:EventTriggerBehavior EventName="PointerEntered">
124+
<i:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
125+
</i:EventTriggerBehavior>
126+
<i:EventTriggerBehavior EventName="PointerExited">
127+
<i:ChangePropertyAction PropertyName="Opacity" Value="0" />
128+
</i:EventTriggerBehavior>
129+
</i:Interaction.Behaviors>
131130
</Button>
132131
</Grid>
133132

0 commit comments

Comments
 (0)