Avalonia v11 - Items to ItemsSource

icsharpcode · Jul 30, 2023 · 5ddf1f7 · 5ddf1f7
1 parent 6d47067
commit 5ddf1f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/ILSpy.Core/Controls/ResourceStringTable.xaml.cs b/ILSpy.Core/Controls/ResourceStringTable.xaml.cs
@@ -44,7 +44,7 @@ public partial class ResourceStringTable : UserControl, IRoutedCommandBindable
         public ResourceStringTable(IEnumerable strings, ContentPresenter contentPresenter)
 		{
             InitializeComponent();
-            resourceListView.Items = strings;
+            resourceListView.ItemsSource = strings;
         }
 
 		private void InitializeComponent()
@@ -77,4 +77,4 @@ void CanExecuteCopy(object sender, CanExecuteRoutedEventArgs args)
 			args.CanExecute = true;
 		}
 	}
-}
+}
diff --git a/ILSpy.Core/MainWindow.xaml.cs b/ILSpy.Core/MainWindow.xaml.cs
@@ -46,6 +46,7 @@
 using AvaloniaEdit;
 using AvaloniaEdit.Highlighting;
 using AvaloniaEdit.Highlighting.Xshd;
+using AvaloniaEdit.Utils;
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Documentation;
 using ICSharpCode.Decompiler.Metadata;
@@ -341,7 +342,7 @@ void InitToolbar()
 			int navigationPos = 0;
 			int openPos = 1;
 			var toolbarCommands = App.ExportProvider.GetExports<ICommand, IToolbarCommandMetadata>("ToolbarCommand");
-			var toolbarItems = toolBar.Items as IList<object> ?? new List<object>();
+			var toolbarItems = toolBar.ItemsSource as IList<object> ?? new List<object>();
 			foreach (var commandGroup in toolbarCommands.OrderBy(c => c.Metadata.ToolbarOrder).GroupBy(c => Properties.Resources.ResourceManager.GetString(c.Metadata.ToolbarCategory))) {
 				if (commandGroup.Key == Properties.Resources.ResourceManager.GetString("Navigation")) {
 					foreach (var command in commandGroup) {
@@ -386,7 +387,7 @@ Button MakeToolbarItem(Lazy<ICommand, IToolbarCommandMetadata> command)
 		void InitMainMenu()
 		{
 			var mainMenuCommands = App.ExportProvider.GetExports<ICommand, IMainMenuCommandMetadata>("MainMenuCommand");
-			var mainMenuItems = mainMenu.Items as IList<object> ?? new List<object>();
+			var mainMenuItems = mainMenu.ItemsSource as IList<object> ?? new List<object>();
 			foreach (var topLevelMenu in mainMenuCommands.OrderBy(c => c.Metadata.MenuOrder).GroupBy(c => GetResourceString(c.Metadata.Menu))) {
 				MenuItem topLevelMenuItem = mainMenu.Items.OfType<MenuItem>().FirstOrDefault(m => (GetResourceString(m.Header as string)) == topLevelMenu.Key);
 				var topLevelMenuItems = topLevelMenuItem?.Items as IList<object> ?? new List<object>();
@@ -1200,7 +1201,7 @@ async void LoadAssemblies(IEnumerable<string> fileNames, List<LoadedAssembly> lo
 			// Select only the last node to avoid multi selection
 			if(lastNode != null) {
 				treeView.SelectedItem = lastNode;
-            }
+			}
 		}
 
 		void RefreshCommandExecuted(object sender, ExecutedRoutedEventArgs e)
@@ -1528,12 +1529,12 @@ public void SetStatus(string status, IBrush foreground)
 
 		public IEnumerable GetMainMenuItems()
 		{
-			return mainMenu.Items;
+			return mainMenu.ItemsSource;
 		}
 
 		public IEnumerable GetToolBarItems()
 		{
-			return toolBar.Items;
+			return toolBar.ItemsSource;
 		}
 	}
 }
diff --git a/SharpTreeView/SharpTreeViewTextSearch.cs b/SharpTreeView/SharpTreeViewTextSearch.cs
@@ -62,7 +62,7 @@ public bool RevertLastCharacter()
 
 		public bool Search(string nextChar)
 		{
-			IList items = (IList)treeView.Items;
+			IList items = (IList)treeView.ItemsSource;
 			int startIndex = isActive ? lastMatchIndex : Math.Max(0, treeView.SelectedIndex);
 			bool lookBackwards = inputStack.Count > 0 && string.Compare(inputStack.Peek(), nextChar, StringComparison.OrdinalIgnoreCase) == 0;
 			int nextMatchIndex = IndexOfMatch(matchPrefix + nextChar, startIndex, lookBackwards, out bool wasNewCharUsed);
@@ -86,7 +86,7 @@ public bool Search(string nextChar)
 
 		int IndexOfMatch(string needle, int startIndex, bool tryBackward, out bool charWasUsed)
 		{
-			IList items = (IList)treeView.Items;
+			IList items = (IList)treeView.ItemsSource;
 			charWasUsed = false;
 			if (items.Count == 0 || string.IsNullOrEmpty(needle))
 				return -1;
@@ -143,4 +143,4 @@ void ResetTimeout()
 			timer.Start();
 		}
 	}
-}
+}