Merge pull request #87 from Bober95/main

Fix Scroll
iNKORE-NET · Aug 29, 2024 · 7b63bc7 · 7b63bc7
2 parents 257a380 + a388444
commit 7b63bc7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/samples/WpfApp1/MainWindow.xaml b/samples/WpfApp1/MainWindow.xaml
@@ -10,11 +10,56 @@
         ui:ThemeManager.IsThemeAware="True"
         ui:WindowHelper.UseModernWindowStyle="True"
         Loaded="Window_Loaded" Background="{DynamicResource {x:Static ui:ThemeKeys.AcrylicBackgroundFillColorDefaultBrushKey}}">
-    <Canvas>
+	<Canvas>
         <Button x:Name="Button_MessageBox" Click="Button_MessageBox_Click" Canvas.Left="152" Canvas.Top="145" VerticalAlignment="Top">
             <ui:IconAndText Icon="{x:Static ui:SegoeFluentIcons.Message}" Content="MessageBox Test"/>
         </Button>
 
+		<ComboBox Canvas.Left="152" Canvas.Top="205" VerticalAlignment="Top">
+			<ComboBoxItem>Item1</ComboBoxItem>
+			<ComboBoxItem>Item2</ComboBoxItem>
+			<ComboBoxItem>Item3</ComboBoxItem>
+			<ComboBoxItem>Item4</ComboBoxItem>
+			<ComboBoxItem>Item5</ComboBoxItem>
+			<ComboBoxItem>Item6</ComboBoxItem>
+			<ComboBoxItem>Item7</ComboBoxItem>
+			<ComboBoxItem>Item8</ComboBoxItem>
+			<ComboBoxItem>Item9</ComboBoxItem>
+			<ComboBoxItem>Item10</ComboBoxItem>
+			<ComboBoxItem>Item11</ComboBoxItem>
+			<ComboBoxItem>Item12</ComboBoxItem>
+			<ComboBoxItem>Item13</ComboBoxItem>
+			<ComboBoxItem>Item14</ComboBoxItem>
+			<ComboBoxItem>Item15</ComboBoxItem>
+			<ComboBoxItem>Item16</ComboBoxItem>
+			<ComboBoxItem>Item17</ComboBoxItem>
+			<ComboBoxItem>Item18</ComboBoxItem>
+			<ComboBoxItem>Item19</ComboBoxItem>
+			<ComboBoxItem>Item20</ComboBoxItem>
+			<ComboBoxItem>Item21</ComboBoxItem>
+			<ComboBoxItem>Item22</ComboBoxItem>
+			<ComboBoxItem>Item23</ComboBoxItem>
+			<ComboBoxItem>Item24</ComboBoxItem>
+			<ComboBoxItem>Item25</ComboBoxItem>
+			<ComboBoxItem>Item26</ComboBoxItem>
+			<ComboBoxItem>Item27</ComboBoxItem>
+			<ComboBoxItem>Item28</ComboBoxItem>
+			<ComboBoxItem>Item29</ComboBoxItem>
+			<ComboBoxItem>Item30</ComboBoxItem>
+		</ComboBox>
+		<ListBox  Canvas.Left="300" Canvas.Top="205" Height="200" Width="200">
+			<ListBoxItem>1</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+			<ListBoxItem>2</ListBoxItem>
+		</ListBox>
+
         <ui:SettingsCard Description="You can use a FontIcon, SymbolIcon or BitmapIcon to set the cards HeaderIcon."
                                Header="Icon options" IsClickEnabled="True" Click="SettingsCard_Click"
                                IsEnabled="true" Canvas.Left="31" Canvas.Top="49" VerticalAlignment="Top">

diff --git a/source/iNKORE.UI.WPF.Modern/Controls/ScrollViewerEx.cs b/source/iNKORE.UI.WPF.Modern/Controls/ScrollViewerEx.cs
@@ -103,7 +103,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         {
             LastVerticalLocation = VerticalOffset;
             LastHorizontalLocation = HorizontalOffset;
-            if (ScrollInfo != null)
+            /*if (ScrollInfo != null)
             {
                 ScrollInfo = new ScrollInfoAdapter(ScrollInfo);
                 ((ScrollInfoAdapter)ScrollInfo).UpdateOffsets();
@@ -112,7 +112,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
                     Source = this,
                     Path = new PropertyPath(nameof(ForceUseSmoothScroll))
                 });
-            }
+            }*/
             UpdateVisualState(false);
         }