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

feat: implement dynamic measure.

Browse Source
This commit is contained in:
rabbitism
2024-02-22 22:52:26 +08:00
parent 395d185714
commit d5a8064202
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
<StackPanel> <StackPanel>
<u:ToolBar HorizontalAlignment="Left" Header="Hello World"> <u:ToolBar HorizontalAlignment="Left" Header="Hello World">
<Button Content="Button 1" /> <Button Content="Button 1" />
<Button Content="Button 2" /> <Button Content="Button 2" u:ToolBar.OverflowMode="AsNeeded" />
<Button Content="Button 3" u:ToolBar.OverflowMode="Always" /> <Button Content="Button 3" u:ToolBar.OverflowMode="Always" />
</u:ToolBar> </u:ToolBar>
<u:ToolBar ItemsSource="{Binding Items}" HorizontalAlignment="Left"> <u:ToolBar ItemsSource="{Binding Items}" HorizontalAlignment="Left">

51
src/Ursa/Controls/ToolBar/ToolBarPanel.cs
View File

@@ -44,9 +44,55 @@ public class ToolBarPanel: StackPanel
Size measureSize = availableSize; Size measureSize = availableSize;
bool horizontal = Orientation == Orientation.Horizontal; bool horizontal = Orientation == Orientation.Horizontal;
bool hasVisibleChildren = false; bool hasVisibleChildren = false;
measureSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
int index = 0; int index = 0;
if (logicalChildren is null) return size; if (logicalChildren is null) return size;
for (int i = 0; i < logicalChildren.Count; i++)
{
Control control = logicalChildren[i];
var mode = ToolBar.GetOverflowMode(control);
control.Measure(measureSize);
if (mode == OverflowMode.Always)
{
ToolBar.SetIsOverflowItem(control, true);
continue;
}
else if (mode == OverflowMode.Never)
{
if (control.IsVisible)
{
hasVisibleChildren = true;
size = horizontal
? size.WithWidth(size.Width + control.DesiredSize.Width + spacing)
.WithHeight(Math.Max(size.Height, control.DesiredSize.Height))
: size.WithHeight(size.Height + control.DesiredSize.Height + spacing)
.WithWidth(Math.Max(size.Width, control.DesiredSize.Width));
ToolBar.SetIsOverflowItem(control, false);
}
}
}
for(int i = 0; i < logicalChildren.Count; i++)
{
Control control = logicalChildren[i];
var mode = ToolBar.GetOverflowMode(control);
if (mode != OverflowMode.AsNeeded) continue;
bool isFit = horizontal
? (size.Width + control.DesiredSize.Width <= availableSize.Width)
: (size.Height + control.DesiredSize.Height <= availableSize.Height);
if (isFit)
{
ToolBar.SetIsOverflowItem(control, false);
size = horizontal
? size.WithWidth(size.Width + control.DesiredSize.Width + spacing)
.WithHeight(Math.Max(size.Height, control.DesiredSize.Height))
: size.WithHeight(size.Height + control.DesiredSize.Height + spacing)
.WithWidth(Math.Max(size.Width, control.DesiredSize.Width));
}
else
{
ToolBar.SetIsOverflowItem(control, true);
}
}
/*
for (int count = logicalChildren.Count; index < count; ++index) for (int count = logicalChildren.Count; index < count; ++index)
{ {
Control control = logicalChildren[index]; Control control = logicalChildren[index];
@@ -74,11 +120,12 @@ public class ToolBarPanel: StackPanel
size = size.WithWidth(Math.Max(size.Width, desiredSize.Width)); size = size.WithWidth(Math.Max(size.Width, desiredSize.Width));
} }
} }
*/
if (hasVisibleChildren) if (hasVisibleChildren)
{ {
size = horizontal ? size.WithWidth(size.Width - spacing) : size.WithHeight(size.Height - spacing); size = horizontal ? size.WithWidth(size.Width - spacing) : size.WithHeight(size.Height - spacing);
} }
return size; return size;
} }