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

fix: fix #243

Browse Source
This commit is contained in:
rabbitism
2024-06-03 15:43:26 +08:00
parent 68c55dd331
commit 899d818ba7
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ursa/Controls/Banner.cs → src/Ursa/Controls/Banner/Banner.cs
View File

@@ -6,6 +6,7 @@ using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Metadata; using Avalonia.Metadata;
using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -57,16 +58,9 @@ public class Banner: HeaderedContentControl
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
base.OnApplyTemplate(e); base.OnApplyTemplate(e);
if (_closeButton != null) Button.ClickEvent.RemoveHandler(OnCloseClick, _closeButton);
{
_closeButton.Click -= OnCloseClick;
}
_closeButton = e.NameScope.Find<Button>(PART_CloseButton); _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
if (_closeButton != null) Button.ClickEvent.AddHandler(OnCloseClick, _closeButton);
{
_closeButton.Click += OnCloseClick;
}
} }
private void OnCloseClick(object sender, RoutedEventArgs args) private void OnCloseClick(object sender, RoutedEventArgs args)

3
src/Ursa/Controls/NavMenu/NavMenuItem.cs
View File

@@ -10,6 +10,7 @@ using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.LogicalTree; using Avalonia.LogicalTree;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Common;
using Irihi.Avalonia.Shared.Helpers; using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -146,7 +147,7 @@ public class NavMenuItem: HeaderedItemsControl
IsHighlightedProperty.AffectsPseudoClass<NavMenuItem>(PC_Highlighted); IsHighlightedProperty.AffectsPseudoClass<NavMenuItem>(PC_Highlighted);
IsHorizontalCollapsedProperty.AffectsPseudoClass<NavMenuItem>(PC_HorizontalCollapsed); IsHorizontalCollapsedProperty.AffectsPseudoClass<NavMenuItem>(PC_HorizontalCollapsed);
IsVerticalCollapsedProperty.AffectsPseudoClass<NavMenuItem>(PC_VerticalCollapsed); IsVerticalCollapsedProperty.AffectsPseudoClass<NavMenuItem>(PC_VerticalCollapsed);
IsSelectedProperty.AffectsPseudoClass<NavMenuItem>(":selected", IsSelectedChangedEvent); IsSelectedProperty.AffectsPseudoClass<NavMenuItem>(PseudoClassName.PC_Selected, IsSelectedChangedEvent);
IsHorizontalCollapsedProperty.Changed.AddClassHandler<NavMenuItem, bool>((item, args) => IsHorizontalCollapsedProperty.Changed.AddClassHandler<NavMenuItem, bool>((item, args) =>
item.OnIsHorizontalCollapsedChanged(args)); item.OnIsHorizontalCollapsedChanged(args));
} }

2
src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
View File

@@ -20,7 +20,7 @@ public abstract class OverlayFeedbackElement: ContentControl
static OverlayFeedbackElement() static OverlayFeedbackElement()
{ {
DataContextProperty.Changed.AddClassHandler<CustomDialogControl, object?>((o, e) => o.OnDataContextChange(e)); DataContextProperty.Changed.AddClassHandler<OverlayFeedbackElement, object?>((o, e) => o.OnDataContextChange(e));
ClosedEvent.AddClassHandler<OverlayFeedbackElement>((o,e)=>o.OnClosed(e)); ClosedEvent.AddClassHandler<OverlayFeedbackElement>((o,e)=>o.OnClosed(e));
} }