Avalonia v11 - Focus. Removed unnecessary Avalonia-v11-Update.md; see…

… PR description
icsharpcode · Aug 16, 2023 · b1431d5 · b1431d5
1 parent bc99baf
commit b1431d5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 62 deletions.
diff --git a/Avalonia-v11-Update.md b/Avalonia-v11-Update.md
diff --git a/ILSpy.Core/CreateListDialog.xaml.cs b/ILSpy.Core/CreateListDialog.xaml.cs
@@ -39,7 +39,7 @@ private void InitializeComponent()
 			//ListName.TextInput += TextBox_TextChanged;
 			ListName.GetObservable(TextBox.TextProperty).Subscribe(text => TextBox_TextChanged(this, new TextInputEventArgs{Text = text}));
 
-			TemplateApplied += (sender, e) => Application.Current.FocusManager.Focus(ListName);
+			TemplateApplied += (sender, e) => ListName.Focus();
 		}
 
 		private void TextBox_TextChanged(object sender, TextInputEventArgs e)
@@ -69,4 +69,4 @@ public string NewListName
 		}
 
 	}
-}
+}
diff --git a/ILSpy.Core/MainWindow.xaml.cs b/ILSpy.Core/MainWindow.xaml.cs
@@ -683,15 +683,9 @@ private bool CanResolveTypeInPEFile(PEFile module, ITypeReference typeRef, out E
 
 		void MainWindow_Loaded(object sender, EventArgs e)
 		{
-			// Avalonia v11
-			//// this.FocusManager.GetFocusedElement().Focus();
-
 			var focusManager = TopLevel.GetTopLevel(this).FocusManager;
 			focusManager.GetFocusedElement().Focus();
 
-			// Avalonia v0.10
-			//// Application.Current.FocusManager.Focus(this);
-
 			InitToolbar();
 
 			ILSpySettings spySettings = this.spySettingsForMainWindow_Loaded;

diff --git a/ILSpy.Core/OpenListDialog.xaml.cs b/ILSpy.Core/OpenListDialog.xaml.cs
@@ -72,14 +72,7 @@ private void InitializeComponent()
 			createButton.Click += CreateButton_Click;
 			resetButton.Click += ResetButton_Click;
 
-			// Avalonia v0.10
-			//// TemplateApplied += (sender, e) => Application.Current.FocusManager.Focus(listView);
-
-			TemplateApplied += (sender, e) => {
-				// Avalonia v11
-				var focusManager = TopLevel.GetTopLevel(listView).FocusManager;
-				focusManager.GetFocusedElement().Focus();
-			};
+			TemplateApplied += (sender, e) => listView.Focus();
 
 			listView.TemplateApplied += listView_Loaded;
 		}