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

Merge pull request #550 from irihitech/pathpicker

Browse Source 
Path Picker Semi Theme improvement
This commit is contained in:
Dong Bin
2025-01-20 18:37:36 +08:00
committed by GitHub
parent 7a0d921625 73c5bcbcdf
commit 539f86dc91
4 changed files with 274 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
demo/Ursa.Demo/Pages/PathPickerDemo.axaml
View File

@@ -1,112 +1,144 @@
<UserControl xmlns="https://github.com/avaloniaui" <UserControl
x:Class="Ursa.Demo.Pages.PathPickerDemo"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa" xmlns:u="https://irihi.tech/ursa"
xmlns:vm="using:Ursa.Demo.ViewModels" xmlns:vm="using:Ursa.Demo.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" d:DesignHeight="450"
x:Class="Ursa.Demo.Pages.PathPickerDemo" d:DesignWidth="800"
x:DataType="vm:PathPickerDemoViewModel"> x:DataType="vm:PathPickerDemoViewModel"
<Grid ColumnDefinitions="*,*" mc:Ignorable="d">
RowDefinitions="7*,3*"> <Grid ColumnDefinitions="*,*" RowDefinitions="7*,3*">
<ScrollViewer Grid.Column="0" Grid.Row="0"> <ScrollViewer Grid.Row="0" Grid.Column="0">
<StackPanel> <StackPanel>
<HeaderedContentControl Theme="{DynamicResource GroupBox}" <HeaderedContentControl
Content="PathPicker aggregates a file selector and provides a Command property. The Command is triggered solely after opening the file selector and selecting a file, whereupon the Command receives an IReadOnlyList&lt;string&gt; parameter."
Header="Functionality and Usage" Header="Functionality and Usage"
Content="PathPicker aggregates a file selector and provides a Command property. The Command is triggered solely after opening the file selector and selecting a file, whereupon the Command receives an IReadOnlyList&lt;string&gt; parameter."> Theme="{DynamicResource GroupBox}" />
</HeaderedContentControl> <u:Form
<u:Form LabelAlignment="Left" LabelPosition="Left" LabelWidth="*" HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<TextBox Name="Title" u:FormItem.Label="Title"></TextBox> LabelAlignment="Left"
<TextBox Name="SuggestedFileName" u:FormItem.Label="SuggestedFileName" LabelPosition="Left"
Watermark="filename(not have file extension)"> LabelWidth="*">
</TextBox> <TextBox
<TextBox Name="SuggestedStartPath" u:FormItem.Label="SuggestedStartPath" Name="Title"
Watermark="D:\Win7 Help\win-x64"> u:FormItem.Label="Title"
</TextBox> Text="选择文件" />
<TextBox Name="FileFilter" u:FormItem.Label="FileFilter" <TextBox
Watermark="[Name,Pattern] like this [123,*.exe,*.pdb] or [All][ImageAll][11,*.txt]"> Name="SuggestedFileName"
</TextBox> u:FormItem.Label="SuggestedFileName"
<TextBox Name="DefaultFileExtension" u:FormItem.Label="DefaultFileExtension" Watermark="filename(not have file extension)" />
Watermark="json"> <TextBox
</TextBox> Name="SuggestedStartPath"
<ToggleButton Name="AllowMultiple" Content="AllowMultiple" u:FormItem.NoLabel="True" u:FormItem.Label="SuggestedStartPath"
HorizontalAlignment="Stretch"> Watermark="D:\Win7 Help\win-x64" />
</ToggleButton> <TextBox
<ToggleButton Name="IsOmitCommandOnCancel" Content="Do not trigger the command after unselecting." Name="FileFilter"
u:FormItem.Label="FileFilter"
Watermark="[Name,Pattern] like this [123,*.exe,*.pdb] or [All][ImageAll][11,*.txt]" />
<TextBox
Name="DefaultFileExtension"
u:FormItem.Label="DefaultFileExtension"
Watermark="json" />
<CheckBox
Name="AllowMultiple"
u:FormItem.NoLabel="True" u:FormItem.NoLabel="True"
HorizontalAlignment="Stretch"> Content="AllowMultiple" />
</ToggleButton> <CheckBox
<ToggleButton Name="IsClearSelectionOnCancel" Content="Clear the selection when unselecting." Name="IsOmitCommandOnCancel"
u:FormItem.NoLabel="True" u:FormItem.NoLabel="True"
HorizontalAlignment="Stretch"> Content="Do not trigger the command after unselecting." />
</ToggleButton> <CheckBox
<u:EnumSelector Name="UsePickerType" EnumType="u:UsePickerTypes" u:FormItem.Label="UsePickerType"></u:EnumSelector> Name="IsClearSelectionOnCancel"
u:FormItem.NoLabel="True"
Content="Clear the selection when unselecting." />
<u:EnumSelector
Name="UsePickerType"
u:FormItem.Label="UsePickerType"
EnumType="u:UsePickerTypes" />
<u:ControlClassesInput
Name="ClassInput"
HorizontalAlignment="Left"
u:FormItem.Label="Style Class" >
<u:ControlClassesInput.Styles>
<Style Selector="u|ControlClassesInput /template/ u|TagInput">
<Setter Property="Watermark" Value="Available: Top"></Setter>
</Style>
</u:ControlClassesInput.Styles>
</u:ControlClassesInput>
</u:Form> </u:Form>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<ScrollViewer Grid.Column="0" Grid.Row="1"> <ScrollViewer Grid.Row="1" Grid.Column="0">
<StackPanel Spacing="2"> <StackPanel Spacing="2">
<HeaderedContentControl Header="Default"> <HeaderedContentControl Header="Default">
<u:PathPicker Title="{Binding #Title.Text}" <u:PathPicker
SuggestedFileName="{Binding #SuggestedFileName.Text}"
SuggestedStartPath="{Binding #SuggestedStartPath.Text}"
FileFilter="{Binding #FileFilter.Text}"
DefaultFileExtension="{Binding #DefaultFileExtension.Text}"
AllowMultiple="{Binding #AllowMultiple.IsChecked}"
UsePickerType="{Binding #UsePickerType.Value}"
SelectedPathsText="{Binding Path,Mode=OneWayToSource}"
SelectedPaths="{Binding Paths,Mode=OneWayToSource}"
Command="{Binding SelectedCommand}"
IsOmitCommandOnCancel="{Binding #IsOmitCommandOnCancel.IsChecked}"
IsClearSelectionOnCancel="{Binding #IsClearSelectionOnCancel.IsChecked}">
</u:PathPicker>
</HeaderedContentControl>
<HeaderedContentControl Header="PathPickerOnlyButton">
<u:PathPicker Theme="{DynamicResource PathPickerOnlyButton}"
Title="{Binding #Title.Text}" Title="{Binding #Title.Text}"
u:ControlClassesInput.Source="{Binding #ClassInput}"
AllowMultiple="{Binding #AllowMultiple.IsChecked, Mode=TwoWay}"
Command="{Binding SelectedCommand}"
DefaultFileExtension="{Binding #DefaultFileExtension.Text}"
FileFilter="{Binding #FileFilter.Text}"
IsClearSelectionOnCancel="{Binding #IsClearSelectionOnCancel.IsChecked}"
IsOmitCommandOnCancel="{Binding #IsOmitCommandOnCancel.IsChecked}"
SelectedPaths="{Binding Paths, Mode=OneWayToSource}"
SelectedPathsText="{Binding Path, Mode=OneWayToSource}"
SuggestedFileName="{Binding #SuggestedFileName.Text}" SuggestedFileName="{Binding #SuggestedFileName.Text}"
SuggestedStartPath="{Binding #SuggestedStartPath.Text}" SuggestedStartPath="{Binding #SuggestedStartPath.Text}"
FileFilter="{Binding #FileFilter.Text}" UsePickerType="{Binding #UsePickerType.Value}" />
DefaultFileExtension="{Binding #DefaultFileExtension.Text}"
AllowMultiple="{Binding #AllowMultiple.IsChecked}"
UsePickerType="{Binding #UsePickerType.Value}"
SelectedPathsText="{Binding Path,Mode=OneWayToSource}"
SelectedPaths="{Binding Paths,Mode=OneWayToSource}"
Command="{Binding SelectedCommand}"
IsOmitCommandOnCancel="{Binding #IsOmitCommandOnCancel.IsChecked}"
IsClearSelectionOnCancel="{Binding #IsClearSelectionOnCancel.IsChecked}">
</u:PathPicker>
</HeaderedContentControl> </HeaderedContentControl>
<HeaderedContentControl Header="PathPickerForListView"> <HeaderedContentControl Header="ButtonPathPicker">
<u:PathPicker Theme="{DynamicResource PathPickerForListView}" <u:PathPicker
Title="{Binding #Title.Text}" Title="{Binding #Title.Text}"
AllowMultiple="{Binding #AllowMultiple.IsChecked}"
Command="{Binding SelectedCommand}"
DefaultFileExtension="{Binding #DefaultFileExtension.Text}"
FileFilter="{Binding #FileFilter.Text}"
IsClearSelectionOnCancel="{Binding #IsClearSelectionOnCancel.IsChecked}"
IsOmitCommandOnCancel="{Binding #IsOmitCommandOnCancel.IsChecked}"
SelectedPaths="{Binding Paths, Mode=OneWayToSource}"
SelectedPathsText="{Binding Path, Mode=OneWayToSource}"
SuggestedFileName="{Binding #SuggestedFileName.Text}" SuggestedFileName="{Binding #SuggestedFileName.Text}"
SuggestedStartPath="{Binding #SuggestedStartPath.Text}" SuggestedStartPath="{Binding #SuggestedStartPath.Text}"
FileFilter="{Binding #FileFilter.Text}" Theme="{DynamicResource ButtonPathPicker}"
DefaultFileExtension="{Binding #DefaultFileExtension.Text}" UsePickerType="{Binding #UsePickerType.Value}" />
</HeaderedContentControl>
<HeaderedContentControl Header="ListPathPicker">
<u:PathPicker
Title="{Binding #Title.Text}"
AllowMultiple="{Binding #AllowMultiple.IsChecked}" AllowMultiple="{Binding #AllowMultiple.IsChecked}"
UsePickerType="{Binding #UsePickerType.Value}"
SelectedPathsText="{Binding Path,Mode=OneWayToSource}"
SelectedPaths="{Binding Paths,Mode=OneWayToSource}"
Command="{Binding SelectedCommand}" Command="{Binding SelectedCommand}"
DefaultFileExtension="{Binding #DefaultFileExtension.Text}"
FileFilter="{Binding #FileFilter.Text}"
IsClearSelectionOnCancel="{Binding #IsClearSelectionOnCancel.IsChecked}"
IsOmitCommandOnCancel="{Binding #IsOmitCommandOnCancel.IsChecked}" IsOmitCommandOnCancel="{Binding #IsOmitCommandOnCancel.IsChecked}"
IsClearSelectionOnCancel="{Binding #IsClearSelectionOnCancel.IsChecked}"> SelectedPaths="{Binding Paths, Mode=OneWayToSource}"
</u:PathPicker> SelectedPathsText="{Binding Path, Mode=OneWayToSource}"
SuggestedFileName="{Binding #SuggestedFileName.Text}"
SuggestedStartPath="{Binding #SuggestedStartPath.Text}"
Theme="{DynamicResource ListPathPicker}"
UsePickerType="{Binding #UsePickerType.Value}" />
</HeaderedContentControl> </HeaderedContentControl>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<ScrollViewer Grid.Column="1" Grid.Row="0" Grid.RowSpan="2"> <ScrollViewer
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="1">
<StackPanel Spacing="1"> <StackPanel Spacing="1">
<TextBlock Text="{Binding CommandTriggerCount,StringFormat='Command Trigger Count:{0}'}"></TextBlock> <TextBlock Text="{Binding CommandTriggerCount, StringFormat='Command Trigger Count:{0}'}" />
<HeaderedContentControl Header="SelectedPathsText"> <HeaderedContentControl Header="SelectedPathsText">
<TextBox Name="SelectedPath" u:FormItem.Label="SelectedPath" IsReadOnly="True" <TextBox
Text="{Binding Path}"> Name="SelectedPath"
</TextBox> u:FormItem.Label="SelectedPath"
IsReadOnly="True"
Text="{Binding Path}" />
</HeaderedContentControl> </HeaderedContentControl>
<HeaderedContentControl Header="SelectedPaths"> <HeaderedContentControl Header="SelectedPaths">
<ListBox Name="SelectedPaths" <ListBox Name="SelectedPaths" ItemsSource="{Binding Paths}" />
ItemsSource="{Binding Paths}">
</ListBox>
</HeaderedContentControl> </HeaderedContentControl>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>

5
demo/Ursa.Demo/ViewModels/MenuViewModel.cs
View File

@@ -12,6 +12,7 @@ public class MenuViewModel : ViewModelBase
{ {
new() { MenuHeader = "Introduction", Key = MenuKeys.MenuKeyIntroduction, IsSeparator = false }, new() { MenuHeader = "Introduction", Key = MenuKeys.MenuKeyIntroduction, IsSeparator = false },
new() { MenuHeader = "Controls", IsSeparator = true }, new() { MenuHeader = "Controls", IsSeparator = true },
new() { MenuHeader = "AspectRatioLayout", Key = MenuKeys.AspectRatioLayout, Status = "New" },
new() { MenuHeader = "AutoCompleteBox", Key = MenuKeys.MenuKeyAutoCompleteBox, Status = "WIP" }, new() { MenuHeader = "AutoCompleteBox", Key = MenuKeys.MenuKeyAutoCompleteBox, Status = "WIP" },
new() { MenuHeader = "Avatar", Key = MenuKeys.MenuKeyAvatar, Status = "WIP" }, new() { MenuHeader = "Avatar", Key = MenuKeys.MenuKeyAvatar, Status = "WIP" },
new() { MenuHeader = "Badge", Key = MenuKeys.MenuKeyBadge }, new() { MenuHeader = "Badge", Key = MenuKeys.MenuKeyBadge },
@@ -44,6 +45,7 @@ public class MenuViewModel : ViewModelBase
new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown }, new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown },
new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad }, new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad },
new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination }, new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
new() { MenuHeader = "PathPicker", Key = MenuKeys.PathPicker, Status = "WIP" },
new() { MenuHeader = "PinCode", Key = MenuKeys.MenuKeyPinCode }, new() { MenuHeader = "PinCode", Key = MenuKeys.MenuKeyPinCode },
new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider }, new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider },
new() { MenuHeader = "Rating", Key = MenuKeys.MenuKeyRating }, new() { MenuHeader = "Rating", Key = MenuKeys.MenuKeyRating },
@@ -59,8 +61,7 @@ public class MenuViewModel : ViewModelBase
new() { MenuHeader = "ToolBar", Key = MenuKeys.MenuKeyToolBar }, new() { MenuHeader = "ToolBar", Key = MenuKeys.MenuKeyToolBar },
new() { MenuHeader = "TreeComboBox", Key = MenuKeys.MenuKeyTreeComboBox }, new() { MenuHeader = "TreeComboBox", Key = MenuKeys.MenuKeyTreeComboBox },
new() { MenuHeader = "TwoTonePathIcon", Key = MenuKeys.MenuKeyTwoTonePathIcon }, new() { MenuHeader = "TwoTonePathIcon", Key = MenuKeys.MenuKeyTwoTonePathIcon },
new() { MenuHeader = "AspectRatioLayout", Key = MenuKeys.AspectRatioLayout, Status = "New" },
new() { MenuHeader = "PathPicker", Key = MenuKeys.PathPicker, Status = "WIP" },
}; };
} }
} }

165
src/Ursa.Themes.Semi/Controls/PathPicker.axaml
View File

@@ -1,82 +1,161 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ursa="https://irihi.tech/ursa"> xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"
<ControlTheme x:Key="{x:Type ursa:PathPicker}" TargetType="ursa:PathPicker"> xmlns:u="https://irihi.tech/ursa">
<Design.PreviewWith>
<StackPanel Margin="20">
<u:PathPicker Title="Hello World" Width="300" />
</StackPanel>
</Design.PreviewWith>
<ControlTheme x:Key="{x:Type u:PathPicker}" TargetType="u:PathPicker">
<Setter Property="CornerRadius" Value="3" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<DockPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" <DockPanel>
VerticalAlignment="{TemplateBinding VerticalAlignment}"> <Button
<Button Name="PART_Button" Name="{x:Static u:PathPicker.PART_Button}"
DockPanel.Dock="Right" HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Content="{TemplateBinding Title}" Content="{TemplateBinding Title}"
Margin="1,0,0,0"> DockPanel.Dock="Right" />
</Button> <TextBox
<TextBox Name="PART_TextBox" Name="PART_TextBox"
DockPanel.Dock="Left"
AcceptsReturn="{TemplateBinding AllowMultiple}" AcceptsReturn="{TemplateBinding AllowMultiple}"
Text="{TemplateBinding SelectedPathsText,Mode=TwoWay}"> DockPanel.Dock="Left"
</TextBox> Text="{TemplateBinding SelectedPathsText,
Mode=TwoWay}" />
</DockPanel> </DockPanel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^[AllowMultiple=False]"> <Style Selector="^ /template/ Button#PART_Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" />
</Style>
<Style Selector="^ /template/ Button#PART_Button"> <Style Selector="^ /template/ Button#PART_Button">
<Setter Property="DockPanel.Dock" Value="Right"></Setter> <Setter Property="DockPanel.Dock" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={x:Static converters:CornerRadiusTakeConverter.Right}}" />
<Setter Property="Margin" Value="1 0 0 0" />
</Style> </Style>
<Style Selector="^ /template/ TextBox#PART_TextBox"> <Style Selector="^ /template/ TextBox#PART_TextBox">
<Setter Property="DockPanel.Dock" Value="Left"></Setter> <Setter Property="DockPanel.Dock" Value="Left" />
<Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={x:Static converters:CornerRadiusTakeConverter.Left}}" />
</Style> </Style>
</Style> <Style Selector="^.Top">
<Style Selector="^[AllowMultiple=True]">
<Style Selector="^ /template/ Button#PART_Button"> <Style Selector="^ /template/ Button#PART_Button">
<Setter Property="DockPanel.Dock" Value="Top"></Setter> <Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={x:Static converters:CornerRadiusTakeConverter.Top}}" />
<Setter Property="Margin" Value="0 0 0 1" />
</Style> </Style>
<Style Selector="^ /template/ TextBox#PART_TextBox"> <Style Selector="^ /template/ TextBox#PART_TextBox">
<Setter Property="DockPanel.Dock" Value="Bottom"></Setter> <Setter Property="DockPanel.Dock" Value="Bottom" />
<Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={x:Static converters:CornerRadiusTakeConverter.Bottom}}" />
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="PathPickerOnlyButton" TargetType="ursa:PathPicker"> <ControlTheme x:Key="ButtonPathPicker" TargetType="u:PathPicker">
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Button Name="PART_Button" <Button
Name="{x:Static u:PathPicker.PART_Button}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}"
Content="{TemplateBinding Title}"> Content="{TemplateBinding Title}" />
</Button>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^ /template/ Button#PART_Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" />
</Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="PathPickerForListView" TargetType="ursa:PathPicker"> <ControlTheme x:Key="ListPathPicker" TargetType="u:PathPicker">
<Setter Property="CornerRadius" Value="3" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Expander HorizontalAlignment="{TemplateBinding HorizontalAlignment}" <Expander
VerticalAlignment="{TemplateBinding VerticalAlignment}"> HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
CornerRadius="{TemplateBinding CornerRadius}"
Theme="{StaticResource INTERNAL_PathPickerExpander}">
<Expander.Header> <Expander.Header>
<Button Name="PART_Button" <Button
Name="PART_Button"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Content="{TemplateBinding Title}"> Content="{TemplateBinding Title}"
<Button.Theme> CornerRadius="{TemplateBinding CornerRadius,
<ControlTheme TargetType="Button"> Converter={x:Static converters:CornerRadiusTakeConverter.Left}}" />
<Setter Property="Template"> </Expander.Header>
<ControlTemplate> <ListBox ItemsSource="{TemplateBinding SelectedPaths}" />
<TextPresenter Text="{TemplateBinding Content}" </Expander>
Background="Transparent"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
</TextPresenter>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^ /template/ Button#PART_Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" />
</Style>
</ControlTheme> </ControlTheme>
</Button.Theme>
</Button> <ControlTheme x:Key="INTERNAL_PathPickerExpander" TargetType="Expander">
</Expander.Header> <Setter Property="Template">
<ListBox ItemsSource="{TemplateBinding SelectedPaths}"></ListBox> <ControlTemplate>
</Expander> <DockPanel>
<DockPanel DockPanel.Dock="Top" LastChildFill="True">
<ToggleButton
Name="ExpanderHeader"
Margin="1,0,0,0"
Background="{DynamicResource ToggleButtonDefaultBackground}"
CornerRadius="{TemplateBinding CornerRadius,
Converter={x:Static converters:CornerRadiusTakeConverter.Right}}"
DockPanel.Dock="Right"
IsChecked="{TemplateBinding IsExpanded,
Mode=TwoWay}"
Theme="{DynamicResource INTERNAL_PathPickerExpanderHeaderToggleButtonTheme}">
<PathIcon
Name="PART_PathIcon"
Data="{DynamicResource ExpanderIcon}"
Theme="{DynamicResource InnerPathIcon}">
<PathIcon.Transitions>
<Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
</Transitions>
</PathIcon.Transitions>
</PathIcon>
</ToggleButton>
<ContentPresenter Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" />
</DockPanel>
<ContentPresenter
Name="PART_ContentPresenter"
Margin="{DynamicResource ExpanderContentMargin}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Foreground="{DynamicResource ExpanderContentForeground}"
IsVisible="{TemplateBinding IsExpanded,
Mode=TwoWay}" />
</DockPanel>
</ControlTemplate>
</Setter>
<Style Selector="^:expanded /template/ PathIcon#PART_PathIcon">
<Setter Property="RenderTransform" Value="rotate(180deg)" />
</Style>
</ControlTheme>
<ControlTheme x:Key="INTERNAL_PathPickerExpanderHeaderToggleButtonTheme" TargetType="ToggleButton">
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<ControlTemplate TargetType="ToggleButton">
<ContentPresenter
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
Content="{TemplateBinding Content}"
CornerRadius="{TemplateBinding CornerRadius}" />
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>

30
src/Ursa/Controls/PathPicker/PathPicker.cs
View File

@@ -5,19 +5,19 @@ using Avalonia.Controls;
using Avalonia.Controls.Metadata; using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Data; using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Logging; using Avalonia.Logging;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
using Avalonia.Threading;
using Irihi.Avalonia.Shared.Common; using Irihi.Avalonia.Shared.Common;
using Irihi.Avalonia.Shared.Helpers; using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls; namespace Ursa.Controls;
[TemplatePart(Name = "PART_Button", Type = typeof(Button))] [TemplatePart(Name = PART_Button, Type = typeof(Button))]
[PseudoClasses(PseudoClassName.PC_Empty)]
public class PathPicker : TemplatedControl public class PathPicker : TemplatedControl
{ {
public const string PART_Button = "PART_Button";
public static readonly StyledProperty<string> SuggestedStartPathProperty = public static readonly StyledProperty<string> SuggestedStartPathProperty =
AvaloniaProperty.Register<PathPicker, string>( AvaloniaProperty.Register<PathPicker, string>(
nameof(SuggestedStartPath), string.Empty); nameof(SuggestedStartPath), string.Empty);
@@ -166,14 +166,6 @@ public class PathPicker : TemplatedControl
{ {
_twoConvertLock = true; _twoConvertLock = true;
string[] separatedStrings = ["\r", "\n", "\r\n"]; string[] separatedStrings = ["\r", "\n", "\r\n"];
// var list = SelectedPathsText?.Split(separatedStrings, StringSplitOptions.RemoveEmptyEntries)
// .Select(RemoveNewLine).ToArray()
// ?? [];
// if (list.Length == SelectedPaths.Count)
// {
// if (SelectedPaths.Select(x => list.Any(y => x == y)).All(x => x is false))
// }
SelectedPaths = SelectedPathsText?.Split(separatedStrings, StringSplitOptions.RemoveEmptyEntries) SelectedPaths = SelectedPathsText?.Split(separatedStrings, StringSplitOptions.RemoveEmptyEntries)
.Select(RemoveNewLine).ToArray() .Select(RemoveNewLine).ToArray()
?? []; ?? [];
@@ -185,7 +177,7 @@ public class PathPicker : TemplatedControl
{ {
base.OnApplyTemplate(e); base.OnApplyTemplate(e);
Button.ClickEvent.RemoveHandler(LaunchPicker, _button); Button.ClickEvent.RemoveHandler(LaunchPicker, _button);
_button = e.NameScope.Find<Button>("PART_Button"); _button = e.NameScope.Find<Button>(PART_Button);
Button.ClickEvent.AddHandler(LaunchPicker, _button); Button.ClickEvent.AddHandler(LaunchPicker, _button);
} }
@@ -243,7 +235,7 @@ public class PathPicker : TemplatedControl
try try
{ {
if (TopLevel.GetTopLevel(this)?.StorageProvider is not { } storageProvider) return; if (TopLevel.GetTopLevel(this)?.StorageProvider is not { } storageProvider) return;
_button?.SetValue(IsEnabledProperty, false);
switch (UsePickerType) switch (UsePickerType)
{ {
case UsePickerTypes.OpenFile: case UsePickerTypes.OpenFile:
@@ -273,7 +265,7 @@ public class PathPicker : TemplatedControl
?.TryGetLocalPath(); ?.TryGetLocalPath();
UpdateSelectedPaths(string.IsNullOrEmpty(path) UpdateSelectedPaths(string.IsNullOrEmpty(path)
? Array.Empty<string>() ? Array.Empty<string>()
: [path!]); : [path]);
break; break;
case UsePickerTypes.OpenFolder: case UsePickerTypes.OpenFolder:
FolderPickerOpenOptions folderPickerOpenOptions = new() FolderPickerOpenOptions folderPickerOpenOptions = new()
@@ -290,16 +282,20 @@ public class PathPicker : TemplatedControl
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
this.PseudoClasses.Set(PseudoClassName.PC_Empty, SelectedPaths.Count == 0);
if (SelectedPaths.Count != 0 || IsOmitCommandOnCancel is false) if (SelectedPaths.Count != 0 || IsOmitCommandOnCancel is false)
{
Command?.Execute(SelectedPaths); Command?.Execute(SelectedPaths);
} }
}
catch (Exception exception) catch (Exception exception)
{ {
Logger.TryGet(LogEventLevel.Error, LogArea.Control)?.Log(this, $"{exception}"); Logger.TryGet(LogEventLevel.Error, LogArea.Control)?.Log(this, $"{exception}");
} }
finally
return; {
_button?.SetValue(IsEnabledProperty, true);
}
} }
private void UpdateSelectedPaths(IReadOnlyList<string> newList) private void UpdateSelectedPaths(IReadOnlyList<string> newList)