Skip to content

Commit 8a0139b

Browse files
committed
Unify CanContentScroll design
1 parent 36db183 commit 8a0139b

File tree

6 files changed

+2
-13
lines changed

6 files changed

+2
-13
lines changed

Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
</ui:Page.Resources>
2020
<ui:ScrollViewerEx
2121
Margin="0"
22-
CanContentScroll="True"
2322
FontSize="14"
2423
VirtualizingStackPanel.IsVirtualizing="True"
2524
VirtualizingStackPanel.ScrollUnit="Pixel">

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
</ui:Page.Resources>
2121
<ui:ScrollViewerEx
2222
Margin="0"
23-
CanContentScroll="False"
2423
FontSize="14"
2524
VirtualizingPanel.ScrollUnit="Pixel"
2625
VirtualizingStackPanel.IsVirtualizing="True">

Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
FontSize="14"
123123
ItemContainerStyle="{StaticResource PluginList}"
124124
ItemsSource="{Binding Source={StaticResource PluginCollectionView}}"
125-
ScrollViewer.CanContentScroll="False"
126125
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
127126
SnapsToDevicePixels="True"
128127
Style="{DynamicResource PluginListStyle}"

Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
</Page.Resources>
1919
<ui:ScrollViewerEx
2020
Padding="5 0 24 0"
21-
CanContentScroll="True"
2221
FontSize="14"
2322
VirtualizingStackPanel.IsVirtualizing="True"
2423
VirtualizingStackPanel.ScrollUnit="Pixel">

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
</ui:Page.Resources>
2626
<ui:ScrollViewerEx
2727
Padding="6 0 24 0"
28-
CanContentScroll="False"
2928
FontSize="14"
3029
VirtualizingStackPanel.IsVirtualizing="True"
3130
VirtualizingStackPanel.ScrollUnit="Pixel">
@@ -89,10 +88,7 @@
8988
</Style.Triggers>
9089
</Style>
9190
</Border.Style>
92-
<ui:ScrollViewerEx
93-
ScrollViewer.CanContentScroll="False"
94-
VirtualizingStackPanel.IsVirtualizing="True"
95-
VirtualizingStackPanel.ScrollUnit="Pixel">
91+
<ui:ScrollViewerEx VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.ScrollUnit="Pixel">
9692
<StackPanel>
9793
<Slider
9894
Name="WindowHeightValue"

Flow.Launcher/WelcomeWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@
8282
<ui:Frame
8383
x:Name="ContentFrame"
8484
HorizontalAlignment="Stretch"
85-
Loaded="ContentFrame_Loaded"
86-
ScrollViewer.CanContentScroll="True"
87-
ScrollViewer.HorizontalScrollBarVisibility="Visible"
88-
ScrollViewer.VerticalScrollBarVisibility="Visible">
85+
Loaded="ContentFrame_Loaded">
8986
<ui:Frame.ContentTransitions>
9087
<ui:TransitionCollection>
9188
<ui:NavigationThemeTransition />

0 commit comments

Comments
 (0)