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

feat: polish demo.

Browse Source
This commit is contained in:
Dong Bin
2025-04-18 18:29:38 +08:00
parent 0144285270
commit 91c67c9490
2 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
View File

@@ -9,44 +9,64 @@
x:DataType="viewModels:PopConfirmDemoViewModel" x:DataType="viewModels:PopConfirmDemoViewModel"
x:Class="Ursa.Demo.Pages.PopConfirmDemo"> x:Class="Ursa.Demo.Pages.PopConfirmDemo">
<StackPanel HorizontalAlignment="Left"> <StackPanel HorizontalAlignment="Left">
<Border Theme="{DynamicResource CardBorder}">
<u:Form>
<u:ControlClassesInput
Name="classInput"
u:FormItem.Label="Control Classes"
Width="240">
</u:ControlClassesInput>
<u:EnumSelector
Name="placement"
Width="240"
u:FormItem.Label="Popup Placement"
EnumType="{x:Type PlacementMode}"
Value="{x:Static PlacementMode.BottomEdgeAlignedLeft}" />
</u:Form>
</Border>
<TextBlock Text="Default PopConfirm" Margin="0 16" /> <TextBlock Text="Default PopConfirm" Margin="0 16" />
<u:PopConfirm PopupHeader="确定是否要保存此修改？" PopupContent="此修改将不可逆" <u:PopConfirm PopupHeader="确定是否要保存此修改？"
HorizontalAlignment="Left"
PopupContent="此修改将不可逆"
Placement="{Binding #placement.Value}"
ConfirmCommand="{Binding ConfirmCommand}" ConfirmCommand="{Binding ConfirmCommand}"
CancelCommand="{Binding Path=CancelCommand}" > CancelCommand="{Binding Path=CancelCommand}">
<Button Content="Hello World"></Button> <Button Content="Hello World" />
</u:PopConfirm> </u:PopConfirm>
<TextBlock Text="Hover to trigger" Margin="0 16" /> <TextBlock Text="Hover to trigger" Margin="0 16" />
<u:PopConfirm PopupHeader="确定是否要保存此修改？" PopupContent="此修改将不可逆" <u:PopConfirm PopupHeader="确定是否要保存此修改？"
PopupContent="此修改将不可逆"
TriggerMode="Focus" TriggerMode="Focus"
HorizontalAlignment="Left"
Placement="{Binding #placement.Value}"
u:ControlClassesInput.Source="{Binding #classInput}" u:ControlClassesInput.Source="{Binding #classInput}"
ConfirmCommand="{Binding ConfirmCommand}" ConfirmCommand="{Binding ConfirmCommand}"
CancelCommand="{Binding Path=CancelCommand}" > CancelCommand="{Binding Path=CancelCommand}">
<Button Content="Hello World"></Button> <Button Content="Hello World" />
</u:PopConfirm> </u:PopConfirm>
<TextBlock Text="Non-button control as main element" Margin="0 16" /> <TextBlock
<u:PopConfirm PopupHeader="确定是否要保存此修改？" PopupContent="此修改将不可逆" Text="Non-button control as main element"
Margin="0 16" />
<u:PopConfirm PopupHeader="确定是否要保存此修改？"
PopupContent="此修改将不可逆"
TriggerMode="Click" TriggerMode="Click"
HorizontalAlignment="Left"
u:ControlClassesInput.Source="{Binding #classInput}" u:ControlClassesInput.Source="{Binding #classInput}"
Placement="BottomEdgeAlignedLeft" Placement="{Binding #placement.Value}"
ConfirmCommand="{Binding ConfirmCommand}" ConfirmCommand="{Binding ConfirmCommand}"
CancelCommand="{Binding Path=CancelCommand}" > CancelCommand="{Binding Path=CancelCommand}">
<TextBlock Text="Hello World" /> <TextBlock Text="Hello World" />
</u:PopConfirm> </u:PopConfirm>
<TextBlock Text="Asynchronized command support" Margin="0 16" /> <TextBlock Text="Asynchronized command support"
<u:PopConfirm PopupHeader="确定是否要保存此修改？" Margin="0 16" />
PopupContent="此修改将不可逆" <u:PopConfirm PopupHeader="确定是否要保存此修改？"
PopupContent="此修改将不可逆"
HorizontalAlignment="Left"
Placement="{Binding #placement.Value}"
u:ControlClassesInput.Source="{Binding #classInput}" u:ControlClassesInput.Source="{Binding #classInput}"
ConfirmCommand="{Binding AsyncConfirmCommand}" ConfirmCommand="{Binding AsyncConfirmCommand}"
CancelCommand="{Binding Path=AsyncCancelCommand}" > CancelCommand="{Binding Path=AsyncCancelCommand}">
<Button Content="Hello World"></Button> <Button Content="Hello World" />
</u:PopConfirm> </u:PopConfirm>
<u:ControlClassesInput Name="classInput" Width="320" >
<u:ControlClassesInput.Styles>
<Style Selector="TextBox">
<Setter Property="Watermark" Value="Change Classes"></Setter>
</Style>
</u:ControlClassesInput.Styles>
</u:ControlClassesInput>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

2
src/Ursa.Themes.Semi/Controls/PopConfirm.axaml
View File

@@ -5,7 +5,7 @@
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:PopConfirm}" <ControlTheme x:Key="{x:Type u:PopConfirm}"
TargetType="u:PopConfirm"> TargetType="u:PopConfirm">
<Setter Property="Placement" Value="TopEdgeAlignedLeft" /> <Setter Property="Placement" Value="BottomEdgeAlignedLeft" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:PopConfirm"> <ControlTemplate TargetType="u:PopConfirm">
<Panel> <Panel>