Fix default FileSelector.Accessible

Track FileSelector.Accessible.Label changes and set
internal labels accordingly.

2 files changed, 61 insertions, 10 deletions

diff --git a/Xwt/Xwt/FileSelector.cs b/Xwt/Xwt/FileSelector.cs
index 2fa41322..ff028f5d 100644
--- a/Xwt/Xwt/FileSelector.cs
+++ b/Xwt/Xwt/FileSelector.cs
@@ -155,6 +155,7 @@ namespace Xwt
 	class DefaultFileSelectorBackend : XwtWidgetBackend, IFileSelectorBackend
 	{
 		TextEntry entry;
+		Button button;
 		FileDialog dialog;
 		FileDialogFilterCollection filters;
 		FileDialogFilter activeFilter;
@@ -172,16 +173,31 @@ namespace Xwt
 			box.Accessible.Title = Application.TranslationCatalog.GetString("File Selector");
 
 			entry = new TextEntry ();
-			entry.Accessible.Label = Application.TranslationCatalog.GetString ("Path");
+			entry.Accessible.Title = Application.TranslationCatalog.GetString ("Path");
 			entry.Visible = true;
 			entry.Changed += (sender, e) => NotifyFileChange ();
 			box.PackStart (entry, true);
 
-			var btn = new Button ("...");
-			btn.Accessible.Label = Application.TranslationCatalog.GetString ("Browse");
-			box.PackStart (btn);
-			btn.Clicked += BtnClicked;
+			button = new Button ("...");
+			button.Accessible.Title = Application.TranslationCatalog.GetString ("Browse");
+			box.PackStart (button);
+			button.Clicked += BtnClicked;
 			Content = box;
+
+			Accessible.PropertyChanged += HandleAccessiblePropertyChanged;
+		}
+
+		private void HandleAccessiblePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof (Accessible.LabelWidget)) {
+				Content.Accessible.LabelWidget = Accessible.LabelWidget;
+				button.Accessible.LabelWidget = Accessible.LabelWidget;
+				entry.Accessible.LabelWidget = Accessible.LabelWidget;
+			} else if (e.PropertyName == nameof (Accessible.Label)) {
+				Content.Accessible.Label = Accessible.Label;
+				button.Accessible.Label = Accessible.Label;
+				entry.Accessible.Label = Accessible.Label;
+			}
 		}
 
 		public FileDialogFilter ActiveFilter {
@@ -294,6 +310,14 @@ namespace Xwt
 				dialog = null;
 			}
 		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && !IsDisposed) {
+				Accessible.PropertyChanged -= HandleAccessiblePropertyChanged;
+			}
+			base.Dispose(disposing);
+		}
 	}
 }
 
diff --git a/Xwt/Xwt/FolderSelector.cs b/Xwt/Xwt/FolderSelector.cs
index aaac9258..6703128b 100644
--- a/Xwt/Xwt/FolderSelector.cs
+++ b/Xwt/Xwt/FolderSelector.cs
@@ -129,6 +129,7 @@ namespace Xwt
 	class DefaultFolderSelectorBackend : XwtWidgetBackend, IFolderSelectorBackend
 	{
 		TextEntry entry;
+		Button button;
 		SelectFolderDialog dialog;
 		string currentFolder;
 		bool enableFolderChangedEvent;
@@ -143,15 +144,33 @@ namespace Xwt
 			box.Accessible.Title = Application.TranslationCatalog.GetString ("Folder Selector");
 
 			entry = new TextEntry ();
-			entry.Accessible.Label = Application.TranslationCatalog.GetString ("Path");
+			entry.Accessible.Title = Application.TranslationCatalog.GetString ("Path");
 			entry.Changed += (sender, e) => NotifyFolderChange();
 			box.PackStart (entry, true);
 
-			var btn = new Button ("...");
-			btn.Accessible.Label = Application.TranslationCatalog.GetString ("Browse");
-			box.PackStart (btn);
-			btn.Clicked += BtnClicked;
+			button = new Button ("...");
+			button.Accessible.Title = Application.TranslationCatalog.GetString ("Browse");
+			box.PackStart (button);
+			button.Clicked += BtnClicked;
 			Content = box;
+
+			Accessible.PropertyChanged += HandleAccessiblePropertyChanged;
+		}
+
+		private void HandleAccessiblePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof(Accessible.LabelWidget))
+			{
+				Content.Accessible.LabelWidget = Accessible.LabelWidget;
+				button.Accessible.LabelWidget = Accessible.LabelWidget;
+				entry.Accessible.LabelWidget = Accessible.LabelWidget;
+			}
+			else if (e.PropertyName == nameof(Accessible.Label))
+			{
+				Content.Accessible.Label = Accessible.Label;
+				button.Accessible.Label = Accessible.Label;
+				entry.Accessible.Label = Accessible.Label;
+			}
 		}
 
 		public string CurrentFolder {
@@ -242,6 +261,14 @@ namespace Xwt
 				dialog = null;
 			}
 		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && !IsDisposed) {
+				Accessible.PropertyChanged -= HandleAccessiblePropertyChanged;
+			}
+			base.Dispose(disposing);
+		}
 	}
 }