minor fixes
This commit is contained in:
@@ -165,12 +165,12 @@ public partial class AvaloniaFlyoutBase : UserControl
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void Close()
|
protected virtual void Close()
|
||||||
{
|
{
|
||||||
OnClose?.Invoke(this, EventArgs.Empty);
|
OnClose?.Invoke(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void Close(object? result)
|
protected virtual void Close(object? result)
|
||||||
{
|
{
|
||||||
Result = result;
|
Result = result;
|
||||||
Close();
|
Close();
|
||||||
@@ -181,6 +181,11 @@ public partial class AvaloniaFlyoutBase : UserControl
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected virtual object? GetResult()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
protected virtual void SetShowTitlePanel()
|
protected virtual void SetShowTitlePanel()
|
||||||
{
|
{
|
||||||
StackPanelHeader.IsVisible = !string.IsNullOrWhiteSpace(Title) || TitleIcon != null;
|
StackPanelHeader.IsVisible = !string.IsNullOrWhiteSpace(Title) || TitleIcon != null;
|
||||||
@@ -189,7 +194,7 @@ public partial class AvaloniaFlyoutBase : UserControl
|
|||||||
protected virtual void ButtonOkay_OnClick(object? sender, RoutedEventArgs e)
|
protected virtual void ButtonOkay_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (ValidateOK())
|
if (ValidateOK())
|
||||||
Close(true);
|
Close(GetResult());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual void ButtonCancel_OnClick(object? sender, RoutedEventArgs e)
|
protected virtual void ButtonCancel_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.2.15</Version>
|
<Version>1.2.16</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user