From 98bb06378ad42de03e061f2ca7293f5d39e7e56e Mon Sep 17 00:00:00 2001 From: Mbucari Date: Mon, 15 May 2023 10:54:56 -0600 Subject: [PATCH] Update Avalonia to v11.0.0-preview8 --- .../Controls/CheckedListBox.axaml | 2 +- .../Dialogs/AccountsDialog.axaml | 26 +++++++------------ .../Dialogs/BookRecordsDialog.axaml | 2 +- .../LibationAvalonia/Dialogs/DialogWindow.cs | 4 +-- .../Dialogs/EditQuickFilters.axaml | 15 +++++------ .../Dialogs/EditReplacementChars.axaml | 2 +- .../Dialogs/EditTemplateDialog.axaml | 2 +- .../Login/LoginExternalDialog.axaml.cs | 2 +- Source/LibationAvalonia/FormSaveExtension.cs | 9 ++++--- .../LibationAvalonia/LibationAvalonia.csproj | 14 +++++----- .../Views/ProcessQueueControl.axaml | 4 +-- .../Views/ProcessQueueControl.axaml.cs | 2 +- .../Views/ProductsDisplay.axaml | 2 +- .../Views/ProductsDisplay.axaml.cs | 2 +- .../Views/SeriesViewGrid.axaml | 2 +- 15 files changed, 41 insertions(+), 49 deletions(-) diff --git a/Source/LibationAvalonia/Controls/CheckedListBox.axaml b/Source/LibationAvalonia/Controls/CheckedListBox.axaml index cf70be9a..66625cbc 100644 --- a/Source/LibationAvalonia/Controls/CheckedListBox.axaml +++ b/Source/LibationAvalonia/Controls/CheckedListBox.axaml @@ -24,7 +24,7 @@ diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml index c61583eb..00577f6f 100644 --- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml @@ -23,7 +23,7 @@ CanUserSortColumns="False" AutoGenerateColumns="False" IsReadOnly="False" - Items="{Binding Accounts}" + ItemsSource="{Binding Accounts}" GridLinesVisibility="All"> @@ -64,14 +64,11 @@ - - - - - - - - + + @@ -96,13 +93,10 @@ - - - - - - - + diff --git a/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml b/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml index b28db5c7..92f6252e 100644 --- a/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml @@ -24,7 +24,7 @@ CanUserSortColumns="True" AutoGenerateColumns="False" IsReadOnly="False" - Items="{Binding DataGridCollectionView}" + ItemsSource="{Binding DataGridCollectionView}" GridLinesVisibility="All"> diff --git a/Source/LibationAvalonia/Dialogs/DialogWindow.cs b/Source/LibationAvalonia/Dialogs/DialogWindow.cs index a46aea77..e6213841 100644 --- a/Source/LibationAvalonia/Dialogs/DialogWindow.cs +++ b/Source/LibationAvalonia/Dialogs/DialogWindow.cs @@ -41,9 +41,9 @@ namespace LibationAvalonia.Dialogs } protected virtual void SaveAndClose() => Close(DialogResult.OK); - protected virtual Task SaveAndCloseAsync() => Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(SaveAndClose); + protected virtual async Task SaveAndCloseAsync() => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(SaveAndClose); protected virtual void CancelAndClose() => Close(DialogResult.Cancel); - protected virtual Task CancelAndCloseAsync() => Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(CancelAndClose); + protected virtual async Task CancelAndCloseAsync() => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(CancelAndClose); private async void DialogWindow_KeyDown(object sender, Avalonia.Input.KeyEventArgs e) { diff --git a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml index db6dee86..54aad592 100644 --- a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml +++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml @@ -23,7 +23,7 @@ CanUserSortColumns="False" AutoGenerateColumns="False" IsReadOnly="False" - Items="{Binding Filters}" + ItemsSource="{Binding Filters}" GridLinesVisibility="All"> @@ -44,14 +44,11 @@ - - - - - - - - + diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml index 4039abf5..f8d8a42b 100644 --- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml +++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml @@ -24,7 +24,7 @@ BeginningEdit="ReplacementGrid_BeginningEdit" CellEditEnding="ReplacementGrid_CellEditEnding" KeyDown="ReplacementGrid_KeyDown" - Items="{Binding replacements}"> + ItemsSource="{Binding replacements}"> diff --git a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml index 4632519b..cd5a9ba6 100644 --- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml @@ -45,7 +45,7 @@ GridLinesVisibility="All" AutoGenerateColumns="False" DoubleTapped="EditTemplateViewModel_DoubleTapped" - Items="{Binding ListItems}" > + ItemsSource="{Binding ListItems}" > diff --git a/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs index 2fce4497..4d6c230b 100644 --- a/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs @@ -53,7 +53,7 @@ namespace LibationAvalonia.Dialogs.Login public async void CopyUrlToClipboard_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) - => await Application.Current.Clipboard.SetTextAsync(ExternalLoginUrl); + => await App.MainWindow.Clipboard.SetTextAsync(ExternalLoginUrl); public void LaunchInBrowser_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) => Go.To.Url(ExternalLoginUrl); diff --git a/Source/LibationAvalonia/FormSaveExtension.cs b/Source/LibationAvalonia/FormSaveExtension.cs index c9bca50b..0a9f0123 100644 --- a/Source/LibationAvalonia/FormSaveExtension.cs +++ b/Source/LibationAvalonia/FormSaveExtension.cs @@ -1,6 +1,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Platform; using LibationFileManager; using System; using System.Linq; @@ -111,12 +112,12 @@ namespace LibationAvalonia public static void HideMinMaxBtns(this Window form) { - if (Design.IsDesignMode || !Configuration.IsWindows) + if (Design.IsDesignMode || !Configuration.IsWindows || form.TryGetPlatformHandle() is not IPlatformHandle handle) return; - var handle = form.PlatformImpl.Handle.Handle; - var currentStyle = GetWindowLong(handle, GWL_STYLE); - SetWindowLong(handle, GWL_STYLE, currentStyle & ~WS_MAXIMIZEBOX & ~WS_MINIMIZEBOX); + var currentStyle = GetWindowLong(handle.Handle, GWL_STYLE); + + SetWindowLong(handle.Handle, GWL_STYLE, currentStyle & ~WS_MAXIMIZEBOX & ~WS_MINIMIZEBOX); } const long WS_MINIMIZEBOX = 0x00020000L; diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index 744f3e98..b703bea6 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -70,13 +70,13 @@ - - - - - - - + + + + + + + diff --git a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml index 555576dc..03323d4e 100644 --- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml +++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml @@ -46,7 +46,7 @@ VerticalCacheLength="1.2" HorizontalCacheLength="1" Background="Transparent" - Items="{Binding Items}" + ItemsSource="{Binding Items}" ItemTemplate="{StaticResource elementFactory}" /> @@ -81,7 +81,7 @@ - + diff --git a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs index 70c95408..0b7761d8 100644 --- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs +++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs @@ -130,7 +130,7 @@ namespace LibationAvalonia.Views private async void LogCopyBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) { string logText = string.Join("\r\n", _viewModel.LogEntries.Select(r => $"{r.LogDate.ToShortDateString()} {r.LogDate.ToShortTimeString()}\t{r.LogMessage}")); - await Application.Current.Clipboard.SetTextAsync(logText); + await App.MainWindow.Clipboard.SetTextAsync(logText); } private async void cancelAllBtn_Click(object sender, EventArgs e) diff --git a/Source/LibationAvalonia/Views/ProductsDisplay.axaml b/Source/LibationAvalonia/Views/ProductsDisplay.axaml index 62207098..a7fb4bf9 100644 --- a/Source/LibationAvalonia/Views/ProductsDisplay.axaml +++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml @@ -15,7 +15,7 @@ ClipboardCopyMode="IncludeHeader" GridLinesVisibility="All" AutoGenerateColumns="False" - Items="{Binding GridEntries}" + ItemsSource="{Binding GridEntries}" CanUserSortColumns="True" BorderThickness="3" CanUserReorderColumns="True"> diff --git a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs index 51860b77..9fe44d1b 100644 --- a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs +++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs @@ -231,7 +231,7 @@ namespace LibationAvalonia.Views var menuItem = new MenuItem { Header = "_Copy Cell Contents" }; menuItem.Click += async (s, e) - => await Application.Current.Clipboard.SetTextAsync(args.CellClipboardContents); + => await App.MainWindow.Clipboard.SetTextAsync(args.CellClipboardContents); args.ContextMenuItems.Add(menuItem); } diff --git a/Source/LibationAvalonia/Views/SeriesViewGrid.axaml b/Source/LibationAvalonia/Views/SeriesViewGrid.axaml index ad7d3a91..69e3326a 100644 --- a/Source/LibationAvalonia/Views/SeriesViewGrid.axaml +++ b/Source/LibationAvalonia/Views/SeriesViewGrid.axaml @@ -11,7 +11,7 @@ ClipboardCopyMode="IncludeHeader" GridLinesVisibility="All" AutoGenerateColumns="False" - Items="{Binding SeriesEntries}" + ItemsSource="{Binding SeriesEntries}" CanUserSortColumns="True" CanUserReorderColumns="True" BorderThickness="3">