Merge branch 'main' into dependency/dotnet/global-json-9.0.310

Author: Arlodotexe

components/MarkdownTextBlock/samples/MarkdownTextBlock.md

@@ -38,5 +38,4 @@ Try typing markdown and see it rendered in real-time:
 ## Custom theme sample
 Try different styling options for all markdown elements with a custom theme:
 
-> [!Sample MarkdownTextBlockCustomThemeSample]
-
+> [!Sample MarkdownTextBlockCustomThemeSample]

components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs

@@ -40,6 +40,8 @@ This sample demonstrates the **custom theming** capabilities of the `MarkdownTex
 
 The image above automatically scales to respect the max width setting while maintaining its aspect ratio. Text continues to flow seamlessly below it.
 
+![Shortcut Conflict](https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/09/ShortcutConflict.png)
+
 ## Code Blocks
 
 ```csharp

components/MarkdownTextBlock/src/MarkdownThemes.cs

@@ -43,15 +43,15 @@ public sealed class MarkdownThemes : DependencyObject
 
     public FontWeight H1FontWeight { get; set; } = FontWeights.SemiBold;
 
-    public FontWeight H2FontWeight { get; set; } = FontWeights.Normal;
+    public FontWeight H2FontWeight { get; set; } = FontWeights.SemiBold;
 
-    public FontWeight H3FontWeight { get; set; } = FontWeights.Normal;
+    public FontWeight H3FontWeight { get; set; } = FontWeights.SemiBold;
 
-    public FontWeight H4FontWeight { get; set;} = FontWeights.Normal;
+    public FontWeight H4FontWeight { get; set;} = FontWeights.SemiBold;
 
-    public FontWeight H5FontWeight { get; set; } = FontWeights.Normal;
+    public FontWeight H5FontWeight { get; set; } = FontWeights.SemiBold;
 
-    public FontWeight H6FontWeight { get; set; } = FontWeights.Normal;
+    public FontWeight H6FontWeight { get; set; } = FontWeights.SemiBold;
 
     public Thickness H1Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
     public Thickness H2Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
@@ -60,14 +60,14 @@ public sealed class MarkdownThemes : DependencyObject
     public Thickness H5Margin { get; set; } = new(left: 0, top: 8, right: 0, bottom: 0);
     public Thickness H6Margin { get; set; } = new(left: 0, top: 8, right: 0, bottom: 0);
 
-    public Brush BorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush BorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
 
-    public Brush TableHeadingBackground { get; set; } = Extensions.GetAccentColorBrush(Windows.UI.ViewManagement.UIColorType.AccentLight3);
+    public Brush TableHeadingBackground { get; set; } = (Brush)Application.Current.Resources["CardBackgroundFillColorDefaultBrush"];
 
-    public Brush InlineCodeBackground { get; set; } = (Brush)Application.Current.Resources["ExpanderHeaderBackground"];
+    public Brush InlineCodeBackground { get; set; } = (Brush)Application.Current.Resources["CardBackgroundFillColorSecondaryBrush"];
     public Brush InlineCodeForeground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
 
-    public Brush InlineCodeBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush InlineCodeBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
 
     public Thickness InlineCodeBorderThickness { get; set; } = new (1);
 
@@ -79,12 +79,12 @@ public sealed class MarkdownThemes : DependencyObject
 
     public FontWeight InlineCodeFontWeight { get; set; } = FontWeights.Normal;
 
-    public FontWeight BoldFontWeight { get; set; } = FontWeights.Bold;
+    public FontWeight BoldFontWeight { get; set; } = FontWeights.SemiBold;
 
     // Legacy parity properties (new)
     // Code block styling
-    public Brush CodeBlockBackground { get; set; } = (Brush)Application.Current.Resources["ExpanderHeaderBackground"];
-    public Brush CodeBlockBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush CodeBlockBackground { get; set; } = (Brush)Application.Current.Resources["CardBackgroundFillColorSecondaryBrush"];
+    public Brush CodeBlockBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
     public Thickness CodeBlockBorderThickness { get; set; } = new Thickness(1);
     public Thickness CodeBlockPadding { get; set; } = new Thickness(8);
     public Thickness CodeBlockMargin { get; set; } = new Thickness(0, 8, 0, 8);
@@ -93,23 +93,23 @@ public sealed class MarkdownThemes : DependencyObject
     public CornerRadius CodeBlockCornerRadius { get; set; } = new CornerRadius(4);
 
     // Horizontal rule
-    public Brush HorizontalRuleBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush HorizontalRuleBrush { get; set; } = (Brush)Application.Current.Resources["DividerStrokeColorDefaultBrush"];
     public double HorizontalRuleThickness { get; set; } = 1.0;
     public Thickness HorizontalRuleMargin { get; set; } = new Thickness(0, 12, 0, 12);
 
     // Link styling
-    public Brush LinkForeground { get; set; } = (Brush)Application.Current.Resources["AccentTextFillColorPrimaryBrush"] ?? new SolidColorBrush(Colors.DodgerBlue);
+    public Brush LinkForeground { get; set; } = (Brush)Application.Current.Resources["AccentTextFillColorPrimaryBrush"];
 
     // Paragraph / list
     public Thickness ParagraphMargin { get; set; } = new Thickness(0, 8, 0, 8);
     public double ParagraphLineHeight { get; set; } = 0; // 0 = default
     public double ListBulletSpacing { get; set; } = 4; // spaces after bullet
-    public double ListGutterWidth { get; set; } = 30; // indent delta per level
+    public double ListGutterWidth { get; set; } = 32; // indent delta per level
     public Thickness ListMargin { get; set; } = new Thickness(0, 4, 0, 4);
 
     // Quote styling
     public Brush QuoteBackground { get; set; } = new SolidColorBrush(Colors.Transparent);
-    public Brush QuoteBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush QuoteBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
     public Thickness QuoteBorderThickness { get; set; } = new Thickness(4, 0, 0, 0);
     public Brush QuoteForeground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
     public Thickness QuoteMargin { get; set; } = new Thickness(0, 4, 0, 4);
@@ -122,12 +122,12 @@ public sealed class MarkdownThemes : DependencyObject
     public Stretch ImageStretch { get; set; } = Stretch.Uniform;
 
     // Table styling
-    public Brush TableBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush TableBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
     public double TableBorderThickness { get; set; } = 1;
     public Thickness TableCellPadding { get; set; } = new Thickness(4);
-    public Thickness TableMargin { get; set; } = new Thickness(0, 10, 0, 10);
+    public Thickness TableMargin { get; set; } = new Thickness(0, 8, 0, 8);
 
     // YAML / not currently used - placeholders for parity
-    public Brush YamlBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
+    public Brush YamlBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
     public Thickness YamlBorderThickness { get; set; } = new Thickness(1);
 }

components/MarkdownTextBlock/src/TextElements/MyImage.cs

@@ -92,10 +92,31 @@ private async void LoadImage(object sender, RoutedEventArgs e)
         if (_loaded) return;
         try
         {
+            // Track whether we have valid natural dimensions to constrain against
+            bool hasNaturalWidth = false;
+            bool hasNaturalHeight = false;
+
             if (_imageProvider != null && _imageProvider.ShouldUseThisProvider(_uri.AbsoluteUri))
             {
                 _image = await _imageProvider.GetImage(_uri.AbsoluteUri);
                 _container.Child = _image;
+                
+                // Capture natural dimensions as max constraints from the provider image
+                // Then clear fixed Width/Height so images can shrink responsively
+                if (_image.Width > 0 && !double.IsNaN(_image.Width) && !double.IsInfinity(_image.Width))
+                {
+                    _image.MaxWidth = _image.Width;
+                    _image.Width = double.NaN; // Clear fixed width to allow shrinking
+                    hasNaturalWidth = true;
+                }
+                if (_image.Height > 0 && !double.IsNaN(_image.Height) && !double.IsInfinity(_image.Height))
+                {
+                    _image.MaxHeight = _image.Height;
+                    _image.Height = double.NaN; // Clear fixed height to allow shrinking
+                    hasNaturalHeight = true;
+                }
+                
+                _loaded = true;
             }
             else
             {
@@ -137,53 +158,50 @@ private async void LoadImage(object sender, RoutedEventArgs e)
                         await bitmap.SetSourceAsync(stream);
                     }
                     _image.Source = bitmap;
-                    _image.Width = bitmap.PixelWidth == 0 ? bitmap.DecodePixelWidth : bitmap.PixelWidth;
-                    _image.Height = bitmap.PixelHeight == 0 ? bitmap.DecodePixelHeight : bitmap.PixelHeight;
+                    // Don't set fixed Width/Height - let layout system handle it
+                    // Store natural dimensions for MaxWidth/MaxHeight constraints
+                    double naturalWidth = bitmap.PixelWidth == 0 ? bitmap.DecodePixelWidth : bitmap.PixelWidth;
+                    double naturalHeight = bitmap.PixelHeight == 0 ? bitmap.DecodePixelHeight : bitmap.PixelHeight;
 
+                    // Use natural size as max constraint so image doesn't upscale
+                    if (naturalWidth > 0)
+                    {
+                        _image.MaxWidth = naturalWidth;
+                        hasNaturalWidth = true;
+                    }
+                    if (naturalHeight > 0)
+                    {
+                        _image.MaxHeight = naturalHeight;
+                        hasNaturalHeight = true;
+                    }
                 }
 
                 _loaded = true;
             }
 
-            // Determine the actual image dimensions
-            double actualWidth = _precedentWidth != 0 ? _precedentWidth : _image.Width;
-            double actualHeight = _precedentHeight != 0 ? _precedentHeight : _image.Height;
-
-            // Apply max constraints and calculate the final size
-            // When using Uniform stretch with max constraints, we need to calculate
-            // the actual rendered size to avoid gaps
-            double finalWidth = actualWidth;
-            double finalHeight = actualHeight;
-
-            bool hasMaxWidth = _themes.ImageMaxWidth > 0;
-            bool hasMaxHeight = _themes.ImageMaxHeight > 0;
-
-            if (hasMaxWidth || hasMaxHeight)
+            // Apply precedent (markdown-specified) dimensions if provided
+            // Precedent always takes priority and sets a known dimension
+            if (_precedentWidth != 0)
             {
-                double scaleX = hasMaxWidth && actualWidth > _themes.ImageMaxWidth 
-                    ? _themes.ImageMaxWidth / actualWidth 
-                    : 1.0;
-                double scaleY = hasMaxHeight && actualHeight > _themes.ImageMaxHeight 
-                    ? _themes.ImageMaxHeight / actualHeight 
-                    : 1.0;
-
-                // For Uniform stretch, use the smaller scale to maintain aspect ratio
-                if (_themes.ImageStretch == Stretch.Uniform || _themes.ImageStretch == Stretch.UniformToFill)
-                {
-                    double uniformScale = Math.Min(scaleX, scaleY);
-                    finalWidth = actualWidth * uniformScale;
-                    finalHeight = actualHeight * uniformScale;
-                }
-                else
-                {
-                    // For other stretch modes, apply constraints independently
-                    finalWidth = actualWidth * scaleX;
-                    finalHeight = actualHeight * scaleY;
-                }
+                _image.MaxWidth = _precedentWidth;
+                hasNaturalWidth = true;
+            }
+            if (_precedentHeight != 0)
+            {
+                _image.MaxHeight = _precedentHeight;
+                hasNaturalHeight = true;
             }
 
-            _image.Width = finalWidth;
-            _image.Height = finalHeight;
+            // Apply theme constraints - only if we have a known dimension to constrain
+            // This prevents theme constraints from enlarging images with unknown natural size
+            if (_themes.ImageMaxWidth > 0 && hasNaturalWidth && _themes.ImageMaxWidth < _image.MaxWidth)
+            {
+                _image.MaxWidth = _themes.ImageMaxWidth;
+            }
+            if (_themes.ImageMaxHeight > 0 && hasNaturalHeight && _themes.ImageMaxHeight < _image.MaxHeight)
+            {
+                _image.MaxHeight = _themes.ImageMaxHeight;
+            }
             _image.Stretch = _themes.ImageStretch;
         }
         catch (Exception) { }