Skip to content

Commit 3bddb85

Browse files
christiannagelchristiannagel
authored
Merge pull request #133 from CodebreakerApp/132-uno-scrollviewer
132 uno scrollviewer
2 parents 7a35bae + 493e651 commit 3bddb85

3 files changed

Lines changed: 40 additions & 33 deletions

File tree

‎src/Codebreaker.Uno/CodebreakerUno/Views/Pages/GamePage.xaml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,15 @@
7777
ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
7878
</StackPanel>
7979
<!--Move section-->
80-
<ListBox
81-
x:Name="listGameMoves"
82-
Grid.Row="2"
83-
Background="Transparent"
84-
SelectedIndex="-1"
85-
IsHitTestVisible="False"
86-
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Running}"
87-
ItemsSource="{x:Bind ViewModel.GameMoves, Mode=OneWay}"
88-
ItemTemplate="{StaticResource PegsTemplate}" />
80+
<ScrollViewer Grid.Row="2" Padding="0,0,0,15" x:Name="pegScrollViewer">
81+
<ListBox
82+
x:Name="listGameMoves"
83+
Background="Transparent"
84+
SelectedIndex="-1"
85+
IsHitTestVisible="False"
86+
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Running}"
87+
ItemsSource="{x:Bind ViewModel.GameMoves, Mode=OneWay}"
88+
ItemTemplate="{StaticResource PegsTemplate}" />
89+
</ScrollViewer>
8990
</Grid>
9091
</Page>

‎src/Codebreaker.Uno/CodebreakerUno/Views/Pages/GamePage.xaml.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public GamePage()
1515
{
1616
ViewModel = App.Current.GetService<GamePageViewModel>();
1717
InitializeComponent();
18+
WeakReferenceMessenger.Default.Register(this);
19+
WeakReferenceMessenger.Default.UnregisterAllOnUnloaded(this);
1820
}
1921

2022
public GamePageViewModel ViewModel { get; }
@@ -40,5 +42,9 @@ public void Receive(GameMoveMessage message)
4042
animation.Configuration = new BasicConnectedAnimationConfiguration();
4143
animation.TryStart(ellipse);
4244
});
45+
46+
// Scroll to bottom
47+
pegScrollViewer.UpdateLayout();
48+
pegScrollViewer.ScrollToVerticalOffset(pegScrollViewer.ScrollableHeight);
4349
}
4450
}

‎src/Codebreaker.Uno/Directory.Packages.props‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
88
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
99
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
10-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1111
<PackageVersion Include="NUnit" Version="4.0.1" />
1212
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
1313
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
@@ -20,37 +20,37 @@
2020
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
2121
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
2222
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
23-
<PackageVersion Include="Uno.Extensions.Core.WinUI" Version="3.0.19" />
24-
<PackageVersion Include="Uno.Extensions.Configuration" Version="3.0.19" />
23+
<PackageVersion Include="Uno.Extensions.Core.WinUI" Version="4.0.0" />
24+
<PackageVersion Include="Uno.Extensions.Configuration" Version="4.0.0" />
2525
<PackageVersion Include="Uno.Extensions.Hosting" Version="3.0.19" />
26-
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="3.0.19" />
27-
<PackageVersion Include="Uno.Extensions.Http" Version="3.0.19" />
28-
<PackageVersion Include="Uno.Extensions.Http.WinUI" Version="3.0.19" />
29-
<PackageVersion Include="Uno.Extensions.Http.Refit" Version="3.0.19" />
26+
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="4.0.0" />
27+
<PackageVersion Include="Uno.Extensions.Http" Version="4.0.0" />
28+
<PackageVersion Include="Uno.Extensions.Http.WinUI" Version="4.0.0" />
29+
<PackageVersion Include="Uno.Extensions.Http.Refit" Version="4.0.0" />
3030
<PackageVersion Include="Uno.Extensions.Localization" Version="3.0.19" />
31-
<PackageVersion Include="Uno.Extensions.Localization.WinUI" Version="3.0.19" />
31+
<PackageVersion Include="Uno.Extensions.Localization.WinUI" Version="4.0.0" />
3232
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
3333
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
34-
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="3.0.19" />
34+
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="4.0.0" />
3535
<PackageVersion Include="Uno.Extensions.Serialization" Version="3.0.19" />
36-
<PackageVersion Include="Uno.Extensions.Serialization.Http" Version="3.0.19" />
37-
<PackageVersion Include="Uno.Extensions.Serialization.Refit" Version="3.0.19" />
38-
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.19" />
36+
<PackageVersion Include="Uno.Extensions.Serialization.Http" Version="4.0.0" />
37+
<PackageVersion Include="Uno.Extensions.Serialization.Refit" Version="4.0.0" />
38+
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.5" />
3939
<PackageVersion Include="Uno.Resizetizer" Version="1.2.1" />
40-
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.143" />
40+
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.50" />
4141
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
42-
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.4" />
43-
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.4" />
44-
<PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.4" />
45-
<PackageVersion Include="Uno.WinUI" Version="5.0.143" />
46-
<PackageVersion Include="Uno.WinUI.Lottie" Version="5.0.143" />
47-
<PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.143" />
48-
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.143" />
49-
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.143" />
50-
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.143" />
51-
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.143" />
42+
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
43+
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
44+
<PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.8" />
45+
<PackageVersion Include="Uno.WinUI" Version="5.1.50" />
46+
<PackageVersion Include="Uno.WinUI.Lottie" Version="5.1.50" />
47+
<PackageVersion Include="Uno.WinUI.DevServer" Version="5.1.50" />
48+
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.1.50" />
49+
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.1.50" />
50+
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.1.50" />
51+
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.50" />
5252
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.2" />
5353
<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
54-
<PackageVersion Include="Xamarin.UITest" Version="4.3.3" />
54+
<PackageVersion Include="Xamarin.UITest" Version="4.3.4" />
5555
</ItemGroup>
5656
</Project>

0 commit comments

Comments
 (0)