Merge pull request #604 from jcoc611-microsoft/user/juosori/StyleFixes1

MarkdownTextBlock: Minor style improvements
CommunityToolkit · Nov 27, 2024 · e85d867 · e85d867
2 parents 5624f79 + 10b4be9
commit e85d867
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/components/MarkdownTextBlock/src/MarkdownThemes.cs b/components/MarkdownTextBlock/src/MarkdownThemes.cs
@@ -49,12 +49,12 @@ public sealed class MarkdownThemes : DependencyObject
 
     public FontWeight H6FontWeight { get; set; } = FontWeights.Normal;
 
-    public Thickness H1Margin { get; set; } = new(0);
-    public Thickness H2Margin { get; set; } = new(0);
-    public Thickness H3Margin { get; set; } = new(0);
-    public Thickness H4Margin { get; set; } = new(0);
-    public Thickness H5Margin { get; set; } = new(0);
-    public Thickness H6Margin { get; set; } = new(0);
+    public Thickness H1Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
+    public Thickness H2Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
+    public Thickness H3Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
+    public Thickness H4Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
+    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 InlineCodeBackground { get; set; } = (Brush)Application.Current.Resources["ExpanderHeaderBackground"];
     public Brush InlineCodeForeground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];

diff --git a/components/MarkdownTextBlock/src/TextElements/MyList.cs b/components/MarkdownTextBlock/src/TextElements/MyList.cs
@@ -45,14 +45,16 @@ public MyList(ListBlock listBlock)
         }
 
         _stackPanel.Orientation = Orientation.Vertical;
+        _stackPanel.Margin = new Thickness(left: 0, top: 8, right: 0, bottom: 8);
         _container.Child = _stackPanel;
         _paragraph.Inlines.Add(_container);
     }
 
     public void AddChild(IAddChild child)
     {
         var grid = new Grid();
-        grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Auto) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(20, GridUnitType.Pixel) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(10, GridUnitType.Pixel) });
         grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) });
         string bullet;
         if (_isOrdered)
@@ -79,11 +81,12 @@ public void AddChild(IAddChild child)
         };
         textBlock.SetValue(Grid.ColumnProperty, 0);
         textBlock.VerticalAlignment = VerticalAlignment.Top;
+        textBlock.TextAlignment = TextAlignment.Right;
         grid.Children.Add(textBlock);
         var flowDoc = new MyFlowDocument();
         flowDoc.AddChild(child);
 
-        flowDoc.RichTextBlock.SetValue(Grid.ColumnProperty, 1);
+        flowDoc.RichTextBlock.SetValue(Grid.ColumnProperty, 2);
         flowDoc.RichTextBlock.Padding = new Thickness(0);
         flowDoc.RichTextBlock.VerticalAlignment = VerticalAlignment.Top;
         grid.Children.Add(flowDoc.RichTextBlock);

diff --git a/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs b/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
@@ -22,14 +22,14 @@ public MyThematicBreak(ThematicBreakBlock thematicBreakBlock)
         _paragraph = new Paragraph();
 
         var inlineUIContainer = new InlineUIContainer();
-        var border = new Border();
-        border.Width = 500;
-        border.BorderThickness = new Thickness(1);
-        border.Margin = new Thickness(0, 4, 0, 4);
-        border.BorderBrush = new SolidColorBrush(Colors.Gray);
-        border.Height = 1;
-        border.HorizontalAlignment = HorizontalAlignment.Stretch;
-        inlineUIContainer.Child = border;
+        Line line = new Line
+        {
+            Stretch = Stretch.Fill,
+            Stroke = new SolidColorBrush(Colors.Gray),
+            X2 = 1,
+            Margin = new Thickness(0, 12, 0, 12)
+        };
+        inlineUIContainer.Child = line;
         _paragraph.Inlines.Add(inlineUIContainer);
     }