Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MarkdownTextBlock: Minor style improvements #604

Merged
merged 4 commits into from
Nov 27, 2024
Merged

MarkdownTextBlock: Minor style improvements #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53a48fb
MarkdownTextBlock: Minor style improvements
Nov 21, 2024
3087a70
Merge branch 'main' into user/juosori/StyleFixes1
Arlodotexe Nov 25, 2024
3765939
Merge branch 'main' into user/juosori/StyleFixes1
Nov 26, 2024
10b4be9
Merge branch 'main' into user/juosori/StyleFixes1
niels9001 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions components/MarkdownTextBlock/src/MarkdownThemes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
7 changes: 5 additions & 2 deletions components/MarkdownTextBlock/src/TextElements/MyList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading