chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: improve drawer demo. fix drawer close button visibility issue.

Browse Source
This commit is contained in:
rabbitism
2024-08-25 23:32:26 +08:00
parent 1d3e21e5a6
commit 38676f729e
12 changed files with 79 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ursa/Controls/Dialog/DefaultDialogControl.cs
View File

@@ -70,7 +70,7 @@ public class DefaultDialogControl : DialogControlBase
private void SetButtonVisibility()
{
var closeButtonVisible = IsCloseButtonVisible ??DataContext is IDialogContext;
var closeButtonVisible = IsCloseButtonVisible ?? (DataContext is IDialogContext || Buttons != DialogButton.YesNo );
IsHitTestVisibleProperty.SetValue(closeButtonVisible, _closeButton);
if (!closeButtonVisible)
{

8
src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
View File

@@ -70,9 +70,13 @@ public class DefaultDrawerControl : DrawerControlBase
private void SetButtonVisibility()
{
var isCloseButtonVisible =
var closeButtonVisible =
IsCloseButtonVisible ?? (DataContext is IDialogContext || Buttons != DialogButton.YesNo);
IsVisibleProperty.SetValue(isCloseButtonVisible, _closeButton);
IsHitTestVisibleProperty.SetValue(closeButtonVisible, _closeButton);
if (!closeButtonVisible)
{
OpacityProperty.SetValue(0, _closeButton);
}
switch (Buttons)
{
case DialogButton.None: