Skip to content

Commit 090a5ff

Browse files
Jack251970Jack251970
committed
Use scrollviewerex
1 parent 6ef2022 commit 090a5ff

File tree

12 files changed

+52
-51
lines changed

12 files changed

+52
-51
lines changed

‎Flow.Launcher/Resources/CustomControlTemplate.xaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@
900900
BorderBrush="{TemplateBinding BorderBrush}"
901901
BorderThickness="{TemplateBinding BorderThickness}"
902902
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
903-
<ScrollViewer
903+
<ui:ScrollViewerEx
904904
x:Name="PART_ContentHost"
905905
Margin="{TemplateBinding BorderThickness}"
906906
Padding="{TemplateBinding Padding}"
@@ -1169,7 +1169,7 @@
11691169
BorderBrush="{DynamicResource CustomComboBorder}"
11701170
BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
11711171
CornerRadius="{Binding ElementName=PopupBorder, Path=CornerRadius}">
1172-
<ScrollViewer
1172+
<ui:ScrollViewerEx
11731173
x:Name="ScrollViewer"
11741174
Foreground="{DynamicResource ComboBoxDropDownForeground}"
11751175
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
@@ -1179,7 +1179,7 @@
11791179
Margin="0"
11801180
KeyboardNavigation.DirectionalNavigation="Contained"
11811181
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
1182-
</ScrollViewer>
1182+
</ui:ScrollViewerEx>
11831183
</Border>
11841184
</Border>
11851185
</ui:ThemeShadowChrome>
@@ -1474,7 +1474,7 @@
14741474
BorderThickness="{DynamicResource CustomTextBoxInlineThickness}"
14751475
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
14761476
</Border>
1477-
<ScrollViewer
1477+
<ui:ScrollViewerEx
14781478
x:Name="PART_ContentHost"
14791479
Grid.Row="1"
14801480
Grid.Column="0"
@@ -2742,7 +2742,7 @@
27422742
BorderThickness="{DynamicResource CustomTextBoxInlineThickness}"
27432743
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
27442744
</Border>
2745-
<ScrollViewer
2745+
<ui:ScrollViewerEx
27462746
x:Name="PART_ContentHost"
27472747
Grid.Row="1"
27482748
Grid.Column="0"
@@ -3147,7 +3147,7 @@
31473147
Background="{DynamicResource MenuFlyoutPresenterBackground}"
31483148
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
31493149
<Grid>
3150-
<ScrollViewer
3150+
<ui:ScrollViewerEx
31513151
x:Name="SubMenuScrollViewer"
31523152
MinWidth="{DynamicResource FlyoutThemeMinWidth}"
31533153
Margin="{DynamicResource MenuFlyoutPresenterThemePadding}"
@@ -3159,7 +3159,7 @@
31593159
KeyboardNavigation.TabNavigation="Cycle"
31603160
RenderOptions.ClearTypeHint="Enabled"
31613161
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
3162-
</ScrollViewer>
3162+
</ui:ScrollViewerEx>
31633163
<Border
31643164
x:Name="SubMenuBorder"
31653165
BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
@@ -3377,7 +3377,7 @@
33773377
Background="{DynamicResource MenuFlyoutPresenterBackground}"
33783378
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
33793379
<Grid>
3380-
<ScrollViewer
3380+
<ui:ScrollViewerEx
33813381
x:Name="SubMenuScrollViewer"
33823382
MinWidth="{DynamicResource FlyoutThemeMinWidth}"
33833383
Margin="{DynamicResource MenuFlyoutPresenterThemePadding}"
@@ -3389,7 +3389,7 @@
33893389
KeyboardNavigation.TabNavigation="Cycle"
33903390
RenderOptions.ClearTypeHint="Enabled"
33913391
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
3392-
</ScrollViewer>
3392+
</ui:ScrollViewerEx>
33933393
<Border
33943394
x:Name="SubMenuBorder"
33953395
BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
@@ -3516,7 +3516,7 @@
35163516
BorderThickness="1"
35173517
CornerRadius="8">
35183518
<Grid>
3519-
<ScrollViewer
3519+
<ui:ScrollViewerEx
35203520
x:Name="ContextMenuScrollViewer"
35213521
MinWidth="{DynamicResource FlyoutThemeMinWidth}"
35223522
Margin="{TemplateBinding Padding}"
@@ -3526,7 +3526,7 @@
35263526
KeyboardNavigation.DirectionalNavigation="Cycle"
35273527
RenderOptions.ClearTypeHint="Enabled"
35283528
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
3529-
</ScrollViewer>
3529+
</ui:ScrollViewerEx>
35303530
<Border
35313531
x:Name="ContextMenuBorder"
35323532
BorderBrush="{TemplateBinding BorderBrush}"
@@ -3631,7 +3631,7 @@
36313631
<RowDefinition Height="*" />
36323632
<RowDefinition x:Name="CommandSpaceRow" Height="80" />
36333633
</Grid.RowDefinitions>
3634-
<ScrollViewer
3634+
<ui:ScrollViewerEx
36353635
x:Name="ContentScrollViewer"
36363636
Margin="{DynamicResource ContentDialogContentScrollViewerMargin}"
36373637
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
@@ -3679,7 +3679,7 @@
36793679
TextElement.Foreground="{TemplateBinding Foreground}"
36803680
TextWrapping="Wrap" />
36813681
</Grid>
3682-
</ScrollViewer>
3682+
</ui:ScrollViewerEx>
36833683
<Border
36843684
x:Name="ButtonAreaBorder"
36853685
Grid.Row="1"
@@ -4985,13 +4985,13 @@
49854985

49864986
<!-- Top nav ItemsRepeater -->
49874987
<ui:ItemsRepeaterScrollHost Grid.Column="3">
4988-
<ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
4988+
<ui:ScrollViewerEx HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
49894989
<ui:ItemsRepeater x:Name="TopNavMenuItemsHost" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}">
49904990
<ui:ItemsRepeater.Layout>
49914991
<ui:StackLayout Orientation="Horizontal" />
49924992
</ui:ItemsRepeater.Layout>
49934993
</ui:ItemsRepeater>
4994-
</ScrollViewer>
4994+
</ui:ScrollViewerEx>
49954995
</ui:ItemsRepeaterScrollHost>
49964996

49974997
<Button
@@ -5012,9 +5012,9 @@
50125012
</Style>
50135013
</ui:Flyout.FlyoutPresenterStyle>
50145014
<ui:ItemsRepeaterScrollHost>
5015-
<ScrollViewer VerticalScrollBarVisibility="Auto">
5015+
<ui:ScrollViewerEx VerticalScrollBarVisibility="Auto">
50165016
<ui:ItemsRepeater x:Name="TopNavMenuItemsOverflowHost" />
5017-
</ScrollViewer>
5017+
</ui:ScrollViewerEx>
50185018
</ui:ItemsRepeaterScrollHost>
50195019
</ui:Flyout>
50205020
</ui:FlyoutService.Flyout>
@@ -5169,13 +5169,13 @@
51695169

51705170
<!-- MenuItems -->
51715171
<ui:ItemsRepeaterScrollHost HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
5172-
<ScrollViewer
5172+
<ui:ScrollViewerEx
51735173
x:Name="MenuItemsScrollViewer"
51745174
KeyboardNavigation.TabNavigation="Local"
51755175
VerticalScrollBarVisibility="Auto">
51765176
<!-- Left nav ItemsRepeater -->
51775177
<ui:ItemsRepeater x:Name="MenuItemsHost" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" />
5178-
</ScrollViewer>
5178+
</ui:ScrollViewerEx>
51795179
</ui:ItemsRepeaterScrollHost>
51805180

51815181
<ui:NavigationViewItemSeparator
@@ -5196,10 +5196,10 @@
51965196

51975197
<!-- FooterItems -->
51985198
<ui:ItemsRepeaterScrollHost Grid.Row="3">
5199-
<ScrollViewer x:Name="FooterItemsScrollViewer">
5199+
<ui:ScrollViewerEx x:Name="FooterItemsScrollViewer">
52005200
<!-- contract7Present:VerticalAnchorRatio="1" -->
52015201
<ui:ItemsRepeater x:Name="FooterMenuItemsHost" />
5202-
</ScrollViewer>
5202+
</ui:ScrollViewerEx>
52035203
</ui:ItemsRepeaterScrollHost>
52045204
</Grid>
52055205

‎Flow.Launcher/Resources/Pages/WelcomePage1.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</Style.Triggers>
100100
</Style>
101101
</Page.Resources>
102-
<ScrollViewer>
102+
<ui:ScrollViewerEx>
103103
<Grid>
104104
<Grid.RowDefinitions>
105105
<RowDefinition Height="250" />
@@ -185,5 +185,5 @@
185185
</StackPanel>
186186
</Canvas>
187187
</Grid>
188-
</ScrollViewer>
188+
</ui:ScrollViewerEx>
189189
</ui:Page>

‎Flow.Launcher/Resources/Pages/WelcomePage2.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</Style.Triggers>
3535
</Style>
3636
</Page.Resources>
37-
<ScrollViewer>
37+
<ui:ScrollViewerEx>
3838
<Grid>
3939
<Grid.RowDefinitions>
4040
<RowDefinition Height="250" />
@@ -121,5 +121,5 @@
121121

122122
</StackPanel>
123123
</Grid>
124-
</ScrollViewer>
124+
</ui:ScrollViewerEx>
125125
</ui:Page>

‎Flow.Launcher/Resources/Pages/WelcomePage3.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
FontSize="20"
4141
FontWeight="SemiBold"
4242
Text="{DynamicResource Welcome_Page3_Title}" />
43-
<ScrollViewer
43+
<ui:ScrollViewerEx
4444
Grid.Row="1"
4545
Height="478"
4646
Margin="0 0 0 0"
@@ -109,6 +109,6 @@
109109
</StackPanel>
110110
</Border>
111111
</StackPanel>
112-
</ScrollViewer>
112+
</ui:ScrollViewerEx>
113113
</Grid>
114114
</ui:Page>

‎Flow.Launcher/Resources/Pages/WelcomePage4.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<Setter Property="Foreground" Value="{DynamicResource Color04B}" />
5555
</Style>
5656
</Page.Resources>
57-
<ScrollViewer>
57+
<ui:ScrollViewerEx>
5858
<Grid>
5959
<Grid.RowDefinitions>
6060
<RowDefinition Height="250" />
@@ -132,5 +132,5 @@
132132

133133
</StackPanel>
134134
</Grid>
135-
</ScrollViewer>
135+
</ui:ScrollViewerEx>
136136
</ui:Page>

‎Flow.Launcher/Resources/Pages/WelcomePage5.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</Style.Triggers>
5050
</Style>
5151
</Page.Resources>
52-
<ScrollViewer>
52+
<ui:ScrollViewerEx>
5353
<Grid>
5454
<Grid.RowDefinitions>
5555
<RowDefinition Height="250" />
@@ -118,5 +118,5 @@
118118

119119
</StackPanel>
120120
</Grid>
121-
</ScrollViewer>
121+
</ui:ScrollViewerEx>
122122
</ui:Page>

‎Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<CollectionViewSource x:Key="SortedFonts" Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" />
1818
</ResourceDictionary>
1919
</ui:Page.Resources>
20-
<ScrollViewer
20+
<ui:ScrollViewerEx
2121
Margin="0"
2222
CanContentScroll="True"
2323
FontSize="14"
@@ -180,5 +180,5 @@
180180
Text="{Binding ActivatedTimes}"
181181
TextWrapping="WrapWithOverflow" />
182182
</StackPanel>
183-
</ScrollViewer>
183+
</ui:ScrollViewerEx>
184184
</ui:Page>

‎Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ui:Page.Resources>
1919
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
2020
</ui:Page.Resources>
21-
<ScrollViewer
21+
<ui:ScrollViewerEx
2222
Margin="0"
2323
CanContentScroll="False"
2424
FontSize="14"
@@ -377,5 +377,5 @@
377377
</cc:Card>
378378
</cc:CardGroup>
379379
</VirtualizingStackPanel>
380-
</ScrollViewer>
380+
</ui:ScrollViewerEx>
381381
</ui:Page>

‎Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
d:DesignHeight="450"
1515
d:DesignWidth="800"
1616
mc:Ignorable="d">
17-
<ScrollViewer
17+
<ui:ScrollViewerEx
1818
Padding="0 0 6 0"
1919
FontSize="14"
2020
VirtualizingStackPanel.IsVirtualizing="True"
@@ -437,5 +437,5 @@
437437

438438

439439
</StackPanel>
440-
</ScrollViewer>
440+
</ui:ScrollViewerEx>
441441
</ui:Page>

‎Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Page.Resources>
1717
<ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" />
1818
</Page.Resources>
19-
<ScrollViewer
19+
<ui:ScrollViewerEx
2020
Padding="5 0 24 0"
2121
CanContentScroll="True"
2222
FontSize="14"
@@ -76,5 +76,5 @@
7676
IsEnabled="{Binding Settings.Proxy.Enabled}" />
7777
</cc:Card>
7878
</StackPanel>
79-
</ScrollViewer>
79+
</ui:ScrollViewerEx>
8080
</ui:Page>

0 commit comments

Comments
 (0)