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.

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

Fix dialog title #245

Merged
merged 5 commits into from
Jan 4, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Automated JetBrains cleanup
Co-authored-by:  <[email protected]>
  • Loading branch information
github-actions[bot] committed Jan 4, 2025
commit 09b66960392ac80a99dd16f7862b304f304f1d88
2 changes: 1 addition & 1 deletion src/Consolonia.Core/Drawing/DrawingContextImpl.cs
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ public void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry)
// if we have strokes to draw
if (streamGeometry.Strokes.Count > 0)
{
pen = pen ?? new Pen(brush, 1);
pen = pen ?? new Pen(brush);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the case when pen is not passed?


var extractColorCheckPlatformSupported =
ExtractColorOrNullWithPlatformCheck(pen, out var lineStyle);
20 changes: 13 additions & 7 deletions src/Consolonia.Themes/Templates/Controls/DialogWindow.axaml
Original file line number Diff line number Diff line change
@@ -43,20 +43,26 @@
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Grid ColumnDefinitions="*">
<Grid ColumnDefinitions="* Auto" VerticalAlignment="Top" Margin="1 0 0 0" ZIndex="30">
<StackPanel Orientation="Horizontal" >
<Grid ColumnDefinitions="* Auto"
VerticalAlignment="Top"
Margin="1 0 0 0"
ZIndex="30">
<StackPanel Orientation="Horizontal">
<helpers:SymbolsControl Text="{TemplateBinding Icon}"
IsVisible="{Binding Icon.Length}"
Foreground="{TemplateBinding BorderBrush}" />
<TextBlock Text="╡" Foreground="{TemplateBinding BorderBrush}" />
<TextBlock Text="╡"
Foreground="{TemplateBinding BorderBrush}" />
<TextBlock Text="{TemplateBinding Title}" />
<TextBlock Text="╞" Foreground="{TemplateBinding BorderBrush}" />
<TextBlock Text="╞"
Foreground="{TemplateBinding BorderBrush}" />
</StackPanel>

<StackPanel Grid.Column="1"
Orientation="Horizontal"
IsVisible="{TemplateBinding IsCloseButtonVisible}">
<Button Content="×" Margin="1 0 0 0"
<Button Content="×"
Margin="1 0 0 0"
Background="{x:Null}"
IsTabStop="False"
Padding="0"
@@ -71,7 +77,7 @@
</StackPanel>
</Grid>

<Border BorderThickness="{TemplateBinding BorderThickness}" >
<Border BorderThickness="{TemplateBinding BorderThickness}">
<Border.BorderBrush>
<controls:LineBrush
Brush="{Binding Path=BorderBrush, RelativeSource={RelativeSource Mode=TemplatedParent}}"
Loading