Merge branch 'main' into milly/idisp

weiyuanyue · web-flow · commit 209fdc27c0f1 · 2026-01-14T15:26:51.000+08:00
diff --git a/AIDevGallery/Controls/ModelPicker/AddHFModelView.xaml b/AIDevGallery/Controls/ModelPicker/AddHFModelView.xaml
@@ -56,7 +56,9 @@
                     Grid.Row="1"
                     HorizontalAlignment="Center"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Text="Browse and download generative language models from Hugging Face." />
+                    Text="Browse and download generative language models from Hugging Face."
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
                 <Grid
                     Grid.Row="2"
                     MaxWidth="560"
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/ESRGAN/SuperResolution.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/ESRGAN/SuperResolution.xaml.cs
@@ -139,10 +139,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
 
         // Pick a file
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
             // Call function to run inference and classify image
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await EnhanceImage(file.Path);
         }
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml b/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml
@@ -35,6 +35,7 @@
             Visibility="Collapsed" />
         <Grid
             Margin="8"
+            Padding="2"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
@@ -44,6 +45,7 @@
                 Padding="8"
                 AutomationProperties.Name="Select image"
                 Click="UploadButton_Click"
+                FocusVisualMargin="-3"
                 ToolTipService.ToolTip="Select image">
 
                 <FontIcon FontSize="16" Glyph="&#xEE71;" />
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml.cs
@@ -134,9 +134,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await Segment(file.Path);
         }
@@ -154,7 +154,7 @@ private async Task Segment(string filePath)
         UploadButton.Visibility = Visibility.Collapsed;
 
         DefaultImage.Source = new BitmapImage(new Uri(filePath));
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: new upload."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: new upload."); // <exclude-line>
 
         using Bitmap originalImage = new(filePath);
         int originalImageWidth = originalImage.Width;
@@ -277,7 +277,7 @@ private async Task Segment(string filePath)
         // Convert the final overlay to BitmapImage for display
         BitmapImage outputImage = BitmapFunctions.ConvertBitmapToBitmapImage(processedImage);
 
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: all regions segmented."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: all regions segmented."); // <exclude-line>
 
         DispatcherQueue.TryEnqueue(() =>
         {
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/Faster RCNN/ObjectDetection.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/Faster RCNN/ObjectDetection.xaml.cs
@@ -136,9 +136,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await DetectObjects(file.Path);
         }
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml b/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml
@@ -35,6 +35,7 @@
             Visibility="Collapsed" />
         <Grid
             Margin="8"
+            Padding="2"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
@@ -44,6 +45,7 @@
                 Padding="8"
                 AutomationProperties.Name="Select image"
                 Click="UploadButton_Click"
+                FocusVisualMargin="-3"
                 ToolTipService.ToolTip="Select image">
 
                 <FontIcon FontSize="16" Glyph="&#xEE71;" />
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml.cs
@@ -133,9 +133,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await DetectPose(file.Path);
         }
@@ -152,7 +152,7 @@ private async Task DetectPose(string filePath)
         Loader.Visibility = Visibility.Visible;
         UploadButton.Visibility = Visibility.Collapsed;
         DefaultImage.Source = new BitmapImage(new Uri(filePath));
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: new upload."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: new upload."); // <exclude-line>
 
         using Bitmap originalImage = new(filePath);
 
@@ -188,7 +188,7 @@ private async Task DetectPose(string filePath)
 
         using Bitmap output = PoseHelper.RenderPredictions(originalImage, predictions, .02f);
         BitmapImage outputImage = BitmapFunctions.ConvertBitmapToBitmapImage(output);
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: key points rendered."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: key points rendered."); // <exclude-line>
 
         DispatcherQueue.TryEnqueue(() =>
         {
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml b/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml
@@ -35,6 +35,7 @@
             Visibility="Collapsed" />
         <Grid
             Margin="8"
+            Padding="2"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
@@ -44,6 +45,7 @@
                 Padding="8"
                 AutomationProperties.Name="Select image"
                 Click="UploadButton_Click"
+                FocusVisualMargin="-3"
                 ToolTipService.ToolTip="Select image">
 
                 <FontIcon FontSize="16" Glyph="&#xEE71;" />
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml.cs
@@ -152,10 +152,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
             // Call function to run inference and classify image
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await RunPipeline(file.Path);
         }
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/YOLOv4/YOLOObjectDetection.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/YOLOv4/YOLOObjectDetection.xaml.cs
@@ -142,10 +142,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
 
         // Pick a file
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
             // Call function to run inference and classify image
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await DetectObjects(file.Path);
         }

Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)`
`139`	`139`
`140`	`140`	`// Pick a file`
`141`	`141`	`var file = await picker.PickSingleFileAsync();`
	`142`	`+ UploadButton.Focus(FocusState.Programmatic);`
`142`	`143`	`if (file != null)`
`143`	`144`	`{`
`144`	`145`	`// Call function to run inference and classify image`
`145`		`- UploadButton.Focus(FocusState.Programmatic);`
`146`	`146`	`SendSampleInteractedEvent("FileSelected"); // <exclude-line>`
`147`	`147`	`await EnhanceImage(file.Path);`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)`
`136`	`136`	`picker.ViewMode = PickerViewMode.Thumbnail;`
`137`	`137`
`138`	`138`	`var file = await picker.PickSingleFileAsync();`
	`139`	`+ UploadButton.Focus(FocusState.Programmatic);`
`139`	`140`	`if (file != null)`
`140`	`141`	`{`
`141`		`- UploadButton.Focus(FocusState.Programmatic);`
`142`	`142`	`SendSampleInteractedEvent("FileSelected"); // <exclude-line>`
`143`	`143`	`await DetectObjects(file.Path);`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)`
`152`	`152`	`picker.ViewMode = PickerViewMode.Thumbnail;`
`153`	`153`
`154`	`154`	`var file = await picker.PickSingleFileAsync();`
	`155`	`+ UploadButton.Focus(FocusState.Programmatic);`
`155`	`156`	`if (file != null)`
`156`	`157`	`{`
`157`	`158`	`// Call function to run inference and classify image`
`158`		`- UploadButton.Focus(FocusState.Programmatic);`
`159`	`159`	`SendSampleInteractedEvent("FileSelected"); // <exclude-line>`
`160`	`160`	`await RunPipeline(file.Path);`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)`
`142`	`142`
`143`	`143`	`// Pick a file`
`144`	`144`	`var file = await picker.PickSingleFileAsync();`
	`145`	`+ UploadButton.Focus(FocusState.Programmatic);`
`145`	`146`	`if (file != null)`
`146`	`147`	`{`
`147`	`148`	`// Call function to run inference and classify image`
`148`		`- UploadButton.Focus(FocusState.Programmatic);`
`149`	`149`	`SendSampleInteractedEvent("FileSelected"); // <exclude-line>`
`150`	`150`	`await DetectObjects(file.Path);`
`151`	`151`	`}`