Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes for dialog & imagebutton

Browse Source
This commit is contained in:
Pilzinsel64
2025-11-11 09:00:14 +01:00
parent 18a549be57
commit 9988b1b19b
6 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
View File

@@ -9,17 +9,20 @@
Orientation="Horizontal"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="6"
>
<Image
x:Name="ButtonImage"
Margin="0, 0, 0, 6"
VerticalAlignment="Center"
Width="16"
Height="16"
x:Name="ButtonImage"
IsVisible="False"
/>
<TextBlock
VerticalAlignment="Center"
x:Name="ButtonText"
VerticalAlignment="Center"
/>
</StackPanel>
</Button>

6
Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
View File

@@ -22,7 +22,11 @@ public partial class ImageButton : Button
public IImage? ImageSource
{
get => ButtonImage.Source;
set => ButtonImage.Source = value;
set
{
ButtonImage.Source = value;
ButtonImage.IsVisible = value != null;
}
}
public double ImageWidth

9
Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
View File

@@ -9,17 +9,20 @@
Orientation="Horizontal"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="6"
>
<Image
x:Name="ButtonImage"
Margin="0, 0, 0, 6"
VerticalAlignment="Center"
Width="16"
Height="16"
x:Name="ButtonImage"
IsVisible="False"
/>
<TextBlock
VerticalAlignment="Center"
x:Name="ButtonText"
VerticalAlignment="Center"
/>
</StackPanel>
</SplitButton>

6
Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
View File

@@ -22,7 +22,11 @@ public partial class ImageSplitButton : SplitButton
public IImage? ImageSource
{
get => ButtonImage.Source;
set => ButtonImage.Source = value;
set
{
ButtonImage.Source = value;
ButtonImage.IsVisible = value != null;
}
}
public double ImageWidth

12
Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
View File

@@ -5,13 +5,19 @@
xmlns:controls="https://git.pilzinsel64.de/pilz-framework/pilz"
xmlns:dialogs="clr-namespace:Pilz.UI.AvaloniaUI.Dialogs"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
x:Class="Pilz.UI.AvaloniaUI.Dialogs.AvaloniaFlyoutBase">
<StackPanel Orientation="Vertical">
<Grid
ColumnDefinitions="*"
RowDefinitions="Auto,*,Auto"
>
<!-- StackPanel: Header -->
<StackPanel
x:Name="StackPanelHeader"
Grid.Row="0"
Orientation="Horizontal"
HorizontalAlignment="Stretch"
Margin="3"
@@ -33,6 +39,7 @@
<!-- Panel: Content -->
<ContentPresenter
Grid.Row="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Margin="3"
@@ -42,6 +49,7 @@
<!-- StackPanel: Footer -->
<Grid
x:Name="StackPanelFooter"
Grid.Row="2"
RowDefinitions="Auto"
ColumnDefinitions="*,Auto,Auto"
HorizontalAlignment="Stretch"
@@ -74,5 +82,5 @@
Click="ButtonCancel_OnClick"
/>
</Grid>
</StackPanel>
</Grid>
</UserControl>

2
Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<PropertyGroup>
<Version>1.2.0</Version>
<Version>1.2.2</Version>
</PropertyGroup>
<ItemGroup>