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

feat: support type.

Browse Source
This commit is contained in:
rabbitism
2024-01-05 00:27:48 +08:00
parent 907bbf16c9
commit 32833d19dd
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Ursa/Controls/Timeline/TimelineItem.cs
View File

@@ -11,7 +11,7 @@ namespace Ursa.Controls;
[PseudoClasses(PC_First, PC_Last, PC_EmptyIcon)]
[TemplatePart(PART_Header, typeof(ContentPresenter))]
[TemplatePart(PART_Icon, typeof(ContentPresenter))]
[TemplatePart(PART_Icon, typeof(Panel))]
[TemplatePart(PART_Content, typeof(ContentPresenter))]
[TemplatePart(PART_Time, typeof(TextBlock))]
[TemplatePart(PART_RootGrid, typeof(Grid))]
@@ -30,7 +30,7 @@ public class TimelineItem: HeaderedContentControl
public const string PART_RootGrid = "PART_RootGrid";
private ContentPresenter? _headerPresenter;
private ContentPresenter? _iconPresenter;
private Panel? _iconPresenter;
private ContentPresenter? _contentPresenter;
private TextBlock? _timePresenter;
private Grid? _rootGrid;
@@ -138,11 +138,11 @@ public class TimelineItem: HeaderedContentControl
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
_rootGrid = e.NameScope.Find<Grid>(PART_RootGrid);
_headerPresenter = e.NameScope.Find<ContentPresenter>(PART_Header);
_iconPresenter = e.NameScope.Find<ContentPresenter>(PART_Icon);
_iconPresenter = e.NameScope.Find<Panel>(PART_Icon);
_contentPresenter = e.NameScope.Find<ContentPresenter>(PART_Content);
_timePresenter = e.NameScope.Find<TextBlock>(PART_Time);
_rootGrid = e.NameScope.Find<Grid>(PART_RootGrid);
PseudoClasses.Set(PC_EmptyIcon, Icon is null);
SetMode(Mode);
}

4
src/Ursa/Controls/Timeline/TimelinePanel.cs
View File

@@ -63,15 +63,13 @@ public class TimelinePanel: Panel
if (child is TimelineItem t)
{
t.SetWidth(left, mid, right);
rect = rect.WithHeight(t.DesiredSize.Height);
t.InvalidateArrange();
//rect = rect.WithHeight(t.DesiredSize.Height);
rect = rect.WithHeight(t.DesiredSize.Height);
child.Arrange(rect);
rect = rect.WithY(rect.Y + t.DesiredSize.Height);
height+=t.DesiredSize.Height;
}
}
//return base.ArrangeOverride(finalSize);
return new Size(left + mid + right, height);
}
}