diff --git a/.idea/.idea.Blacklight/.idea/avalonia.xml b/.idea/.idea.Blacklight/.idea/avalonia.xml index b0754ad44a5dd0c71ed0944bcf58a386255a172b..c64d48f3573376652e879ca36a7d6e68f2f8d869 100644 --- a/.idea/.idea.Blacklight/.idea/avalonia.xml +++ b/.idea/.idea.Blacklight/.idea/avalonia.xml @@ -8,6 +8,7 @@ <entry key="Blacklight/ErrorWindow.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" /> <entry key="Blacklight/Views/App.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" /> <entry key="Blacklight/Views/ClientView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" /> + <entry key="Blacklight/Views/Dialogs/CreateChannelView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" /> <entry key="Blacklight/Views/Documents/DocumentView.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" /> <entry key="Blacklight/Views/ErrorBoundary.axaml" value="Blacklight.Desktop/Blacklight.Desktop.csproj" /> <entry key="Blacklight/Views/LoadingView.axaml" value="Blacklight/Blacklight.csproj" /> diff --git a/Blacklight.Desktop/Blacklight.Desktop.csproj b/Blacklight.Desktop/Blacklight.Desktop.csproj index c9947ee14d5fc965a9a644d91d758eb3d6f3b837..329c12861606b4479cafdf77b02f31504a6c3cb4 100644 --- a/Blacklight.Desktop/Blacklight.Desktop.csproj +++ b/Blacklight.Desktop/Blacklight.Desktop.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>WinExe</OutputType> diff --git a/Blacklight/Blacklight.csproj b/Blacklight/Blacklight.csproj index d7c3af54b36de8b14a2b4bc9b85a1dba1b1e49c3..ee993e10f0f94bde0c3d57acd69a227af7ab41f2 100644 --- a/Blacklight/Blacklight.csproj +++ b/Blacklight/Blacklight.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net9.0</TargetFramework> <Nullable>enable</Nullable> diff --git a/Blacklight/Util/ScrollToEndBehavior.cs b/Blacklight/Util/ScrollToEndBehavior.cs index 4b6dffae17742045a961621a302ffe77fae25d42..f3425d6547605947237e6c3bb1630133def15bdc 100644 --- a/Blacklight/Util/ScrollToEndBehavior.cs +++ b/Blacklight/Util/ScrollToEndBehavior.cs @@ -28,13 +28,13 @@ public class ScrollToEndBehavior : Behavior<ScrollViewer> private void ScrollNow(bool shouldScroll) { - Log.Information("I should scroll maybe? {ShouldScroll}, {Other}", shouldScroll, AssociatedObject != null); - if (shouldScroll && AssociatedObject != null) + Log.Debug("I should scroll maybe? {ShouldScroll}, {Other}", shouldScroll, AssociatedObject != null); + Dispatcher.UIThread.Post(() => { - Dispatcher.UIThread.Post(() => + if (shouldScroll && AssociatedObject != null) { - AssociatedObject.ScrollToEnd(); - }); - } + AssociatedObject.ScrollToEnd(); + } + }); } } diff --git a/Blacklight/ViewModels/ClientViewModel.cs b/Blacklight/ViewModels/ClientViewModel.cs index b1d4d229de762a2cd8efd1cf825389683db03c39..bb9b62e4a287e4d61aa51610ae594e83b4e8bb13 100644 --- a/Blacklight/ViewModels/ClientViewModel.cs +++ b/Blacklight/ViewModels/ClientViewModel.cs @@ -44,6 +44,7 @@ public class ClientViewModel : ViewModelBase Client = client; DebugFactoryEvents(_factory); + Layout = _factory?.CreateLayout(); if (Layout is { }) { _factory?.InitLayout(Layout); @@ -52,7 +53,6 @@ public class ClientViewModel : ViewModelBase root.Navigate.Execute("Home"); } } - Layout = _factory?.CreateLayout(); NewLayout = new RelayCommand(ResetLayout); Logout = new RelayCommand(LogoutNow); diff --git a/Lightquark.NET/Lightquark.NET.csproj b/Lightquark.NET/Lightquark.NET.csproj index af2f5cd29a26d50b6321e19adedd9eeb77b4590a..0f98b0a767e8373bfd46d3ae380d5604e98a4b97 100644 --- a/Lightquark.NET/Lightquark.NET.csproj +++ b/Lightquark.NET/Lightquark.NET.csproj @@ -8,7 +8,7 @@ <ItemGroup> <PackageReference Include="AutoMapper" Version="14.0.0" /> - <PackageReference Include="Avalonia" Version="11.2.5" /> + <PackageReference Include="Avalonia" Version="11.1.3" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" /> <PackageReference Include="Lightquark.Types" Version="2024.9.15.139" /> <PackageReference Include="Markdig" Version="0.40.0" />