Skip to content

Commit 36db183

Browse files
committed
Use ScrollViewerEx for smooth scroll
1 parent 7c8dcab commit 36db183

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

Flow.Launcher/PluginUpdateWindow.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
7+
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
78
Title="{DynamicResource updateAllPluginsButtonContent}"
89
Width="530"
910
Background="{DynamicResource PopuBGColor}"
@@ -66,13 +67,13 @@
6667
Text="{DynamicResource updateAllPluginsButtonContent}"
6768
TextAlignment="Left" />
6869

69-
<ScrollViewer
70+
<ui:ScrollViewerEx
7071
MaxHeight="300"
7172
Margin="0 5 0 5"
7273
HorizontalScrollBarVisibility="Disabled"
7374
VerticalScrollBarVisibility="Auto">
7475
<StackPanel x:Name="UpdatePluginStackPanel" />
75-
</ScrollViewer>
76+
</ui:ScrollViewerEx>
7677

7778
<Rectangle
7879
Height="1"

Flow.Launcher/ReleaseNotesWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</Grid>
167167

168168
<!-- Do not use scroll function of MarkdownViewer because it does not support smooth scroll -->
169-
<ScrollViewer
169+
<ui:ScrollViewerEx
170170
x:Name="MarkdownScrollViewer"
171171
Grid.Row="2"
172172
Grid.Column="0"
@@ -193,7 +193,7 @@
193193
VerticalScrollBarVisibility="Disabled"
194194
Visibility="Collapsed" />
195195
</Grid>
196-
</ScrollViewer>
196+
</ui:ScrollViewerEx>
197197

198198
<!-- This Grid is for display progress ring and refresh button. -->
199199
<!-- And it is also for changing the size of the MarkdownViewer. -->

Flow.Launcher/Resources/Pages/WelcomePage2.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Grid>
3939
<Grid.RowDefinitions>
4040
<RowDefinition Height="250" />
41-
<RowDefinition Height="340"/>
41+
<RowDefinition Height="340" />
4242
</Grid.RowDefinitions>
4343

4444
<Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -89,12 +89,13 @@
8989
</StackPanel>
9090
</Border>
9191

92-
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
93-
<StackPanel Margin="24 20 24 20">
92+
<ui:ScrollViewerEx Grid.Row="1" VerticalScrollBarVisibility="Visible">
93+
<StackPanel Margin="24 20 24 20">
9494
<TextBlock
9595
FontSize="20"
9696
FontWeight="SemiBold"
97-
Text="{DynamicResource Welcome_Page2_Title}" TextWrapping="WrapWithOverflow"/>
97+
Text="{DynamicResource Welcome_Page2_Title}"
98+
TextWrapping="WrapWithOverflow" />
9899
<TextBlock
99100
Margin="0 10 0 0"
100101
FontSize="14"
@@ -119,7 +120,7 @@
119120
WindowTitle="{DynamicResource flowlauncherHotkey}" />
120121
</StackPanel>
121122

122-
</ScrollViewer>
123+
</ui:ScrollViewerEx>
123124
</Grid>
124125
</ui:ScrollViewerEx>
125126
</ui:Page>

0 commit comments

Comments
 (0)