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

fix: fix a header issue. add handler to check date selection.

Browse Source
This commit is contained in:
rabbitism
2024-06-20 01:49:25 +08:00
parent 72682332c3
commit b5133a58f8
3 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Pages/DatePickerDemo.axaml
View File

@@ -6,6 +6,6 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Ursa.Demo.Pages.DatePickerDemo"> x:Class="Ursa.Demo.Pages.DatePickerDemo">
<StackPanel Margin="20" HorizontalAlignment="Left"> <StackPanel Margin="20" HorizontalAlignment="Left">
<u:CalendarView/> <u:CalendarView OnDateSelected="CalendarView_OnOnDateSelected" OnDatePreviewed="CalendarView_OnOnDatePreviewed"/>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

10
demo/Ursa.Demo/Pages/DatePickerDemo.axaml.cs
View File

@@ -12,4 +12,14 @@ public partial class DatePickerDemo : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
private void CalendarView_OnOnDateSelected(object? sender, CalendarDayButtonEventArgs e)
{
Debug.WriteLine("Pressed: "+ e.Date.ToLongDateString());
}
private void CalendarView_OnOnDatePreviewed(object? sender, CalendarDayButtonEventArgs e)
{
Debug.WriteLine("Hovered: "+e.Date.ToLongDateString());
}
} }

98
src/Ursa/Controls/DateTimePicker/CalendarView.cs
View File

@@ -1,5 +1,4 @@
using System.Diagnostics; using System.Globalization;
using System.Globalization;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Metadata; using Avalonia.Controls.Metadata;
@@ -38,7 +37,7 @@ public class CalendarView : TemplatedControl
internal static readonly DirectProperty<CalendarView, CalendarViewMode> ModeProperty = internal static readonly DirectProperty<CalendarView, CalendarViewMode> ModeProperty =
AvaloniaProperty.RegisterDirect<CalendarView, CalendarViewMode>( AvaloniaProperty.RegisterDirect<CalendarView, CalendarViewMode>(
nameof(Mode), o => o.Mode, (o, v) => o.Mode = v, unsetValue: CalendarViewMode.Month); nameof(Mode), o => o.Mode, (o, v) => o.Mode = v);
public static readonly StyledProperty<bool> IsTodayHighlightedProperty = public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
DatePickerBase.IsTodayHighlightedProperty.AddOwner<CalendarView>(); DatePickerBase.IsTodayHighlightedProperty.AddOwner<CalendarView>();
@@ -47,20 +46,19 @@ public class CalendarView : TemplatedControl
DatePickerBase.FirstDayOfWeekProperty.AddOwner<CalendarView>(); DatePickerBase.FirstDayOfWeekProperty.AddOwner<CalendarView>();
private readonly Calendar _calendar = new GregorianCalendar(); private readonly Calendar _calendar = new GregorianCalendar();
private Button? _headerButton;
private Button? _monthButton;
private Button? _yearButton;
private Grid? _monthGrid;
private Grid? _yearGrid;
private CalendarViewMode _mode;
private Button? _fastPreviousButton;
private Button? _previousButton;
private Button? _nextButton;
private Button? _fastNextButton; private Button? _fastNextButton;
private Button? _fastPreviousButton;
private Button? _headerButton;
private CalendarViewMode _mode;
private Button? _monthButton;
private Grid? _monthGrid;
private Button? _nextButton;
private Button? _previousButton;
private Button? _yearButton;
private Grid? _yearGrid;
static CalendarView() static CalendarView()
@@ -147,6 +145,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.Year += 1; ContextCalendar.Year += 1;
UpdateDayButtons(); UpdateDayButtons();
} }
UpdateHeaderButtons(); UpdateHeaderButtons();
} }
@@ -160,6 +159,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.Month = 1; ContextCalendar.Month = 1;
ContextCalendar.Year += 1; ContextCalendar.Year += 1;
} }
UpdateDayButtons(); UpdateDayButtons();
} }
else if (Mode == CalendarViewMode.Year) else if (Mode == CalendarViewMode.Year)
@@ -179,6 +179,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.EndYear += 100; ContextCalendar.EndYear += 100;
UpdateYearButtons(); UpdateYearButtons();
} }
UpdateHeaderButtons(); UpdateHeaderButtons();
} }
@@ -192,6 +193,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.Month = 12; ContextCalendar.Month = 12;
ContextCalendar.Year -= 1; ContextCalendar.Year -= 1;
} }
UpdateDayButtons(); UpdateDayButtons();
} }
else if (Mode == CalendarViewMode.Year) else if (Mode == CalendarViewMode.Year)
@@ -211,6 +213,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.EndYear -= 100; ContextCalendar.EndYear -= 100;
UpdateYearButtons(); UpdateYearButtons();
} }
UpdateHeaderButtons(); UpdateHeaderButtons();
} }
@@ -221,6 +224,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.Year -= 1; ContextCalendar.Year -= 1;
UpdateDayButtons(); UpdateDayButtons();
} }
UpdateHeaderButtons(); UpdateHeaderButtons();
} }
@@ -243,7 +247,8 @@ public class CalendarView : TemplatedControl
UpdateYearButtons(); UpdateYearButtons();
return; return;
} }
if(Mode == CalendarViewMode.Decade)
if (Mode == CalendarViewMode.Decade)
{ {
Mode = CalendarViewMode.Century; Mode = CalendarViewMode.Century;
var range = DateTimeHelper.GetCenturyViewRangeByYear(ContextCalendar.StartYear!.Value); var range = DateTimeHelper.GetCenturyViewRangeByYear(ContextCalendar.StartYear!.Value);
@@ -253,13 +258,14 @@ public class CalendarView : TemplatedControl
UpdateYearButtons(); UpdateYearButtons();
return; return;
} }
if (Mode == CalendarViewMode.Century) return; if (Mode == CalendarViewMode.Century) return;
} }
/// <summary> /// <summary>
/// Generate Buttons and labels for MonthView. /// Generate Buttons and labels for MonthView.
/// Generate Buttons for YearView. /// Generate Buttons for YearView.
/// This method should be called only once. /// This method should be called only once.
/// </summary> /// </summary>
private void InitializeGridButtons() private void InitializeGridButtons()
{ {
@@ -317,13 +323,11 @@ public class CalendarView : TemplatedControl
var cell = children[i] as CalendarDayButton; var cell = children[i] as CalendarDayButton;
if (cell is null) continue; if (cell is null) continue;
cell.DataContext = day; cell.DataContext = day;
if (IsTodayHighlighted) if (IsTodayHighlighted) cell.IsToday = day == DateTime.Today;
{
cell.IsToday = day == DateTime.Today;
}
cell.Content = day.Day.ToString(info); cell.Content = day.Day.ToString(info);
dateToSet = dateToSet.AddDays(1); dateToSet = dateToSet.AddDays(1);
} }
FadeOutDayButtons(); FadeOutDayButtons();
} }
@@ -335,24 +339,24 @@ public class CalendarView : TemplatedControl
if (mode == CalendarViewMode.Century && contextDate.StartYear.HasValue) if (mode == CalendarViewMode.Century && contextDate.StartYear.HasValue)
{ {
var range = DateTimeHelper.GetCenturyViewRangeByYear(contextDate.StartYear.Value); var range = DateTimeHelper.GetCenturyViewRangeByYear(contextDate.StartYear.Value);
int start = range.start-10; var start = range.start - 10;
for (int i = 0; i < 12; i++) for (var i = 0; i < 12; i++)
{ {
var child = _yearGrid.Children[i] as CalendarYearButton; var child = _yearGrid.Children[i] as CalendarYearButton;
child?.SetContext(CalendarViewMode.Century, child?.SetContext(CalendarViewMode.Century,
new CalendarContext() { StartYear = start, EndYear = start + 10 }); new CalendarContext { StartYear = start, EndYear = start + 10 });
start+= 10; start += 10;
} }
} }
else if(mode == CalendarViewMode.Decade && contextDate.StartYear.HasValue) else if (mode == CalendarViewMode.Decade && contextDate.StartYear.HasValue)
{ {
var range = DateTimeHelper.GetDecadeViewRangeByYear(contextDate.StartYear.Value); var range = DateTimeHelper.GetDecadeViewRangeByYear(contextDate.StartYear.Value);
int year = range.start - 1; var year = range.start - 1;
for (int i = 0; i < 12; i++) for (var i = 0; i < 12; i++)
{ {
var child = _yearGrid.Children[i] as CalendarYearButton; var child = _yearGrid.Children[i] as CalendarYearButton;
child?.SetContext(CalendarViewMode.Decade, child?.SetContext(CalendarViewMode.Decade,
new CalendarContext() { Year = year}); new CalendarContext { Year = year });
year++; year++;
} }
} }
@@ -361,7 +365,7 @@ public class CalendarView : TemplatedControl
for (var i = 0; i < 12; i++) for (var i = 0; i < 12; i++)
{ {
var child = _yearGrid.Children[i] as CalendarYearButton; var child = _yearGrid.Children[i] as CalendarYearButton;
child?.SetContext(CalendarViewMode.Year, new CalendarContext() { Month = i }); child?.SetContext(CalendarViewMode.Year, new CalendarContext { Month = i });
} }
} }
} }
@@ -371,13 +375,8 @@ public class CalendarView : TemplatedControl
if (_monthGrid is null) return; if (_monthGrid is null) return;
var children = _monthGrid.Children; var children = _monthGrid.Children;
for (var i = 7; i < children.Count; i++) for (var i = 7; i < children.Count; i++)
{
if (children[i] is CalendarDayButton { DataContext: DateTime d } button) if (children[i] is CalendarDayButton { DataContext: DateTime d } button)
{
button.IsNotCurrentMonth = d.Month != ContextCalendar.Month; button.IsNotCurrentMonth = d.Month != ContextCalendar.Month;
}
}
} }
private void UpdateMonthViewHeader(DayOfWeek day) private void UpdateMonthViewHeader(DayOfWeek day)
@@ -417,6 +416,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.Month = e.Date.Month; ContextCalendar.Month = e.Date.Month;
UpdateDayButtons(); UpdateDayButtons();
} }
OnDateSelected?.Invoke(sender, e); OnDateSelected?.Invoke(sender, e);
} }
@@ -469,7 +469,7 @@ public class CalendarView : TemplatedControl
ContextCalendar.StartYear = e.Context.StartYear; ContextCalendar.StartYear = e.Context.StartYear;
ContextCalendar.EndYear = e.Context.EndYear; ContextCalendar.EndYear = e.Context.EndYear;
} }
else if(Mode == CalendarViewMode.Decade) else if (Mode == CalendarViewMode.Decade)
{ {
Mode = CalendarViewMode.Year; Mode = CalendarViewMode.Year;
ContextCalendar.Year = e.Context.Year; ContextCalendar.Year = e.Context.Year;
@@ -489,6 +489,7 @@ public class CalendarView : TemplatedControl
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
UpdateHeaderButtons(); UpdateHeaderButtons();
UpdateYearButtons(); UpdateYearButtons();
} }
@@ -498,30 +499,35 @@ public class CalendarView : TemplatedControl
if (Mode == CalendarViewMode.Century) if (Mode == CalendarViewMode.Century)
{ {
IsVisibleProperty.SetValue(true, _headerButton, _yearGrid); IsVisibleProperty.SetValue(true, _headerButton, _yearGrid);
IsVisibleProperty.SetValue(false, _yearButton, _monthButton, _monthGrid, _fastPreviousButton, _fastNextButton); IsVisibleProperty.SetValue(false, _yearButton, _monthButton, _monthGrid, _fastPreviousButton,
_headerButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.StartYear + "-" + ContextCalendar.EndYear); _fastNextButton);
_headerButton?.SetValue(ContentControl.ContentProperty,
ContextCalendar.StartYear + "-" + ContextCalendar.EndYear);
} }
else if (Mode == CalendarViewMode.Decade) else if (Mode == CalendarViewMode.Decade)
{ {
IsVisibleProperty.SetValue(true, _headerButton, _yearGrid); IsVisibleProperty.SetValue(true, _headerButton, _yearGrid);
IsVisibleProperty.SetValue(false, _yearButton, _monthButton, _monthGrid, _fastPreviousButton, _fastNextButton); IsVisibleProperty.SetValue(false, _yearButton, _monthButton, _monthGrid, _fastPreviousButton,
_headerButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.StartYear + "-" + ContextCalendar.EndYear); _fastNextButton);
_headerButton?.SetValue(ContentControl.ContentProperty,
ContextCalendar.StartYear + "-" + ContextCalendar.EndYear);
} }
else if (Mode == CalendarViewMode.Year) else if (Mode == CalendarViewMode.Year)
{ {
IsVisibleProperty.SetValue(true, _headerButton, _yearGrid); IsVisibleProperty.SetValue(true, _headerButton, _yearGrid);
IsVisibleProperty.SetValue(false, _yearButton, _monthButton, _monthGrid, _fastPreviousButton, _fastNextButton); IsVisibleProperty.SetValue(false, _yearButton, _monthButton, _monthGrid, _fastPreviousButton,
_fastNextButton);
_headerButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.Year); _headerButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.Year);
} }
else if (Mode == CalendarViewMode.Month) else if (Mode == CalendarViewMode.Month)
{ {
IsVisibleProperty.SetValue(false, _headerButton, _yearGrid); IsVisibleProperty.SetValue(false, _headerButton, _yearGrid);
IsVisibleProperty.SetValue(true, _yearButton, _monthButton, _monthGrid, _fastPreviousButton, _fastNextButton); IsVisibleProperty.SetValue(true, _yearButton, _monthButton, _monthGrid, _fastPreviousButton,
_fastNextButton);
// _headerButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.Year); // _headerButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.Year);
_yearButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.Year); _yearButton?.SetValue(ContentControl.ContentProperty, ContextCalendar.Year);
_monthButton?.SetValue(ContentControl.ContentProperty, _monthButton?.SetValue(ContentControl.ContentProperty,
DateTimeHelper.GetCurrentDateTimeFormatInfo().AbbreviatedMonthNames[ContextCalendar.Month ?? 0]); DateTimeHelper.GetCurrentDateTimeFormatInfo().AbbreviatedMonthNames[ContextCalendar.Month-1 ?? 0]);
} }
} }
} }