GithubStar/AtomUI
1
0
Fork 0
mirror of https://github.com/AtomUI/AtomUI.git synced 2026-10-29 15:19:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the DatePicker calling condition judgment problem

Browse Source
This commit is contained in:
chinboy
2025-01-21 19:21:58 +08:00
parent 5c42a6508d
commit 0e105ac308
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AtomUI.Controls/Calendar/BaseCalendarDayButtonTheme.cs
+1 -1
View File
@@ -45,7 +45,7 @@ internal class BaseCalendarDayButtonTheme : BaseControlTheme
contentPresenter.Content = buttonLabel;
BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ContentProperty, buttonLabel, TextBlock.TextProperty,
input => input?.ToString());
BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
BindUtils.RelayBind(contentPresenter, ContentPresenter.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
CreateTemplateParentBinding(contentPresenter, ContentPresenter.PaddingProperty,
TemplatedControl.PaddingProperty);
src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButtonTheme.cs
+3 -3
View File
@@ -35,16 +35,16 @@ internal class CalendarDayButtonTheme : BaseControlTheme
VerticalContentAlignment = VerticalAlignment.Center,
};
var buttonLabel = new TextBlock()
var buttonLabel = new TextBlock
{
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
};
contentPresenter.Content = buttonLabel;
BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ContentProperty, buttonLabel, TextBlock.TextProperty,
BindUtils.RelayBind(calendarDayButton, CalendarDayButton.ContentProperty, buttonLabel, TextBlock.TextProperty,
input => input?.ToString());
BindUtils.RelayBind(calendarDayButton, BaseCalendarDayButton.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
BindUtils.RelayBind(contentPresenter, ContentPresenter.ForegroundProperty, buttonLabel, TextBlock.ForegroundProperty);
CreateTemplateParentBinding(contentPresenter, ContentPresenter.PaddingProperty,
TemplatedControl.PaddingProperty);
src/AtomUI.Controls/Flyouts/FlyoutStateHelper.cs
+1 -1
View File
@@ -284,7 +284,7 @@ internal class FlyoutStateHelper : AvaloniaObject
return;
}
if (!Flyout.IsOpen)
if (!Flyout.IsOpen && TopLevel.GetTopLevel(AnchorTarget) == args.Root)
{
if (OpenFlyoutPredicate is not null)
{
src/AtomUI.Controls/TextBlock.cs
+1
View File
@@ -1,4 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;