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

feat: remove item template dependency

Browse Source
This commit is contained in:
rabbitism
2023-06-29 03:28:04 +08:00
parent c878e45047
commit 69e2ce9980
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ursa.Themes.Semi/Controls/TagInput.axaml
View File

@@ -17,8 +17,8 @@
<ControlTemplate TargetType="u:TagInput"> <ControlTemplate TargetType="u:TagInput">
<Border <Border
MinHeight="30" MinHeight="30"
Padding="4" Padding="8,4"
VerticalAlignment="Top" VerticalAlignment="Stretch"
Background="{DynamicResource SemiColorFill0}" Background="{DynamicResource SemiColorFill0}"
CornerRadius="3"> CornerRadius="3">
<Panel HorizontalAlignment="Stretch"> <Panel HorizontalAlignment="Stretch">
@@ -55,7 +55,7 @@
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="TextBox"> <ControlTemplate TargetType="TextBox">
<Border> <Border Padding="0,4">
<ScrollViewer <ScrollViewer
Width="{Binding $parent[TextBox].Bounds.Width}" Width="{Binding $parent[TextBox].Bounds.Width}"
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}" AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"

2
src/Ursa/Controls/TagInput/TagInput.cs
View File

@@ -139,7 +139,7 @@ public class TagInput: TemplatedControl
public void Close(object o) public void Close(object o)
{ {
if (o is ClosableTag t) if (o is Control t)
{ {
var presenter = t.Parent as ContentPresenter; var presenter = t.Parent as ContentPresenter;
if (presenter != null) if (presenter != null)