Do not treat empty visual text as an accessibility label

src/ui/Features/Files/ManualChosenEncoding/ManualChosenEncodingWindow.cs

@@ -171,7 +171,7 @@ private static Control MakePreviewBox(ManualChosenEncodingViewModel vm)
         textBox.Bind(TextBox.TextProperty, new Binding(nameof(vm.PreviewText)) { Source = vm, Mode = BindingMode.OneWay });
 
         grid.Add(label, 0);
-        grid.Add(textBox, 1);
+        grid.Add(textBox.WithLabeledBy(label), 1);
 
         return UiUtil.MakeBorderForControl(grid);
     }

src/ui/Features/SpellCheck/EditWholeText/EditWholeTextWindow.cs

@@ -64,7 +64,7 @@ public EditWholeTextWindow(EditWholeTextViewModel vm)
         };
 
         grid.Add(labelLineInfo, 0, 0);
-        grid.Add(textBoxWholeText, 1, 0);
+        grid.Add(textBoxWholeText.WithLabeledBy(labelLineInfo), 1, 0);
         grid.Add(panelButtons, 2, 0);
 
         Content = grid;

src/ui/Features/Tools/ApplyDurationLimits/ApplyDurationLimitsWindow.cs

@@ -191,6 +191,7 @@ private static Grid MakeFixesView(ApplyDurationLimitsViewModel vm)
             item => item.Apply, (item, v) => item.Apply = v);
 
         grid.Add(labelFixesAvailable, 0);
+        dataGrid.WithLabeledBy(labelFixesAvailable);
         grid.Add(UiUtil.MakeBorderForControlNoPadding(dataGrid), 1);
 
         return grid;
@@ -281,6 +282,7 @@ private static Grid MakeCannotFixView(ApplyDurationLimitsViewModel vm)
         }, RoutingStrategies.Tunnel);
 
         grid.Add(labelFixesAvailable, 0);
+        dataGrid.WithLabeledBy(labelFixesAvailable);
         grid.Add(UiUtil.MakeBorderForControlNoPadding(dataGrid), 1);
 
         return grid;

src/ui/Features/Video/RemuxVideo/PickAudioTrackWindow.cs

@@ -42,6 +42,7 @@ public PickAudioTrackWindow(PickAudioTrackViewModel vm)
         };
         comboBox.Bind(ComboBox.ItemsSourceProperty, new Binding(nameof(PickAudioTrackViewModel.Tracks)));
         comboBox.Bind(ComboBox.SelectedItemProperty, new Binding(nameof(PickAudioTrackViewModel.SelectedTrack)));
+        comboBox.WithAccessibleName(Se.Language.Video.RemuxVideoSelectAudioTrack);
 
         var buttonOk = UiUtil.MakeButtonOk(vm.OkCommand);
         var buttonCancel = UiUtil.MakeButtonCancel(vm.CancelCommand);

src/ui/Logic/AccessibleLabels.cs

@@ -52,9 +52,9 @@
             }
 
             // A placeholder text is the label sighted users see in an unlabeled box.
             if (control is TextBox { Watermark.Length: > 0 and <= 80 } textBox)
             {
                 AutomationProperties.SetName(control, textBox.Watermark);
                 labeled.Add(control);
             }
         }
@@ -211,18 +211,19 @@
     {
         if (control is Label label)
         {
-            return label.Content is not Control;
+            return label.Content is string labelText && !string.IsNullOrWhiteSpace(labelText);
         }
 
         if (control is CheckBox or RadioButton)
         {
-            return ((ContentControl)control).Content is string;
+            return ((ContentControl)control).Content is string contentText &&
+                   !string.IsNullOrWhiteSpace(contentText);
         }
 
         if (control is TextBlock textBlock)
         {
             var text = textBlock.Text;
-            return text == null || (text.Length <= 80 && !text.Contains('\n'));
+            return !string.IsNullOrWhiteSpace(text) && text.Length <= 80 && !text.Contains('\n');
         }
 
         return false;

tests/UI/Logic/AccessibleLabelsTests.cs

@@ -0,0 +1,61 @@
+using Avalonia.Automation;
+using Avalonia.Controls;
+using Avalonia.Headless.XUnit;
+using Nikse.SubtitleEdit.Logic;
+using Xunit;
+
+namespace UITests.Logic;
+
+public class AccessibleLabelsTests
+{
+    [AvaloniaFact]
+    public void Apply_DoesNotUseEmptyTextBlockAsLabel()
+    {
+        var grid = new Grid();
+        var label = new TextBlock();
+        var input = new TextBox();
+
+        Grid.SetColumn(input, 1);
+        grid.Children.Add(label);
+        grid.Children.Add(input);
+
+        AccessibleLabels.Apply(grid);
+
+        Assert.Null(AutomationProperties.GetLabeledBy(input));
+        Assert.False(AccessibleLabels.HasAccessibleName(input));
+    }
+
+    [AvaloniaFact]
+    public void Apply_DoesNotUseEmptyLabelAsLabel()
+    {
+        var grid = new Grid();
+        var label = new Label();
+        var input = new TextBox();
+
+        Grid.SetColumn(input, 1);
+        grid.Children.Add(label);
+        grid.Children.Add(input);
+
+        AccessibleLabels.Apply(grid);
+
+        Assert.Null(AutomationProperties.GetLabeledBy(input));
+        Assert.False(AccessibleLabels.HasAccessibleName(input));
+    }
+
+    [AvaloniaFact]
+    public void Apply_StillUsesVisibleShortTextAsLabel()
+    {
+        var grid = new Grid();
+        var label = new TextBlock { Text = "Frame rate" };
+        var input = new ComboBox();
+
+        Grid.SetColumn(input, 1);
+        grid.Children.Add(label);
+        grid.Children.Add(input);
+
+        AccessibleLabels.Apply(grid);
+
+        Assert.Same(label, AutomationProperties.GetLabeledBy(input));
+        Assert.True(AccessibleLabels.HasAccessibleName(input));
+    }
+}