Skip to content

Commit 05f15d9

Browse files
committed
Upgrade iNKORE.UI.WPF.Modern and refactor scroll logic
Upgraded `iNKORE.UI.WPF.Modern` to version `0.10.2.1` and replaced the custom `CustomScrollViewerEx` implementation with the built-in `ScrollViewerEx` for simplified scrolling behavior. Updated `Flow.Launcher.Plugin` to version `5.1.0` for compatibility. Removed unused namespaces and adjusted styles in `Base.xaml` to align with the new `ScrollViewerEx` usage.
1 parent c6c4132 commit 05f15d9

File tree

4 files changed

+13
-264
lines changed

4 files changed

+13
-264
lines changed

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<PrivateAssets>all</PrivateAssets>
139139
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
140140
</PackageReference>
141-
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.1" />
141+
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1" />
142142
<PackageReference Include="MdXaml" Version="1.27.0" />
143143
<PackageReference Include="MdXaml.AnimatedGif" Version="1.27.0" />
144144
<PackageReference Include="MdXaml.Html" Version="1.27.0" />

Flow.Launcher/Resources/Controls/CustomScrollViewerEx.cs

Lines changed: 0 additions & 253 deletions
This file was deleted.

Flow.Launcher/Themes/Base.xaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,14 @@
252252
<Setter Property="Template">
253253
<Setter.Value>
254254
<ControlTemplate TargetType="ListBox">
255-
<cc:CustomScrollViewerEx
255+
<ui:ScrollViewerEx
256256
x:Name="ListBoxScrollViewer"
257257
Focusable="False"
258+
IsScrollAnimationEnabled="False"
259+
RewriteWheelChange="True"
258260
Template="{DynamicResource ScrollViewerControlTemplate}">
259-
<cc:CustomScrollViewerEx.Style>
260-
<Style TargetType="cc:CustomScrollViewerEx">
261+
<ui:ScrollViewerEx.Style>
262+
<Style TargetType="ui:ScrollViewerEx">
261263
<Style.Triggers>
262264
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible">
263265
<Setter Property="Margin" Value="0 0 0 0" />
@@ -269,9 +271,9 @@
269271
</Trigger>
270272
</Style.Triggers>
271273
</Style>
272-
</cc:CustomScrollViewerEx.Style>
274+
</ui:ScrollViewerEx.Style>
273275
<VirtualizingStackPanel IsItemsHost="True" />
274-
</cc:CustomScrollViewerEx>
276+
</ui:ScrollViewerEx>
275277
</ControlTemplate>
276278
</Setter.Value>
277279
</Setter>

Flow.Launcher/packages.lock.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
},
2929
"iNKORE.UI.WPF.Modern": {
3030
"type": "Direct",
31-
"requested": "[0.10.1, )",
32-
"resolved": "0.10.1",
33-
"contentHash": "nRYmBosiL+42eUpLbHeqP7qJqtp5EpzuIMZTpvq4mFV33VB/JjkFg1y82gk50pjkXlAQWDvRyrfSAmPR5AM+3g==",
31+
"requested": "[0.10.2.1, )",
32+
"resolved": "0.10.2.1",
33+
"contentHash": "nGwuuVul+TcLCTgPmaAZCc0fYFqUpCNZ8PiulVT3gZnsWt/AvxMZ0DSPpuyI/iRPc/NhFIg9lSIR7uaHWV0I/Q==",
3434
"dependencies": {
3535
"iNKORE.UI.WPF": "1.2.8"
3636
}
@@ -1619,7 +1619,7 @@
16191619
"FSharp.Core": "[9.0.303, )",
16201620
"Flow.Launcher.Infrastructure": "[1.0.0, )",
16211621
"Flow.Launcher.Localization": "[0.0.6, )",
1622-
"Flow.Launcher.Plugin": "[5.0.0, )",
1622+
"Flow.Launcher.Plugin": "[5.1.0, )",
16231623
"Meziantou.Framework.Win32.Jobs": "[3.4.5, )",
16241624
"Microsoft.IO.RecyclableMemoryStream": "[3.0.1, )",
16251625
"SemanticVersioning": "[3.0.0, )",
@@ -1634,7 +1634,7 @@
16341634
"BitFaster.Caching": "[2.5.4, )",
16351635
"CommunityToolkit.Mvvm": "[8.4.0, )",
16361636
"Flow.Launcher.Localization": "[0.0.6, )",
1637-
"Flow.Launcher.Plugin": "[5.0.0, )",
1637+
"Flow.Launcher.Plugin": "[5.1.0, )",
16381638
"InputSimulator": "[1.0.4, )",
16391639
"MemoryPack": "[1.21.4, )",
16401640
"Microsoft.VisualStudio.Threading": "[17.14.15, )",

0 commit comments

Comments
 (0)