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

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

@@ -1,83 +1,162 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ursa="https://irihi.tech/ursa">
<ControlTheme x:Key="{x:Type ursa:PathPicker}" TargetType="ursa:PathPicker">
<ResourceDictionary
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"
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">
<ControlTemplate>
<DockPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}">
<Button Name="PART_Button"
DockPanel.Dock="Right"
Content="{TemplateBinding Title}"
Margin="1,0,0,0">
</Button>
<TextBox Name="PART_TextBox"
DockPanel.Dock="Left"
AcceptsReturn="{TemplateBinding AllowMultiple}"
Text="{TemplateBinding SelectedPathsText,Mode=TwoWay}">
</TextBox>
<DockPanel>
<Button
Name="{x:Static u:PathPicker.PART_Button}"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Content="{TemplateBinding Title}"
DockPanel.Dock="Right" />
<TextBox
Name="PART_TextBox"
AcceptsReturn="{TemplateBinding AllowMultiple}"
DockPanel.Dock="Left"
Text="{TemplateBinding SelectedPathsText,
Mode=TwoWay}" />
</DockPanel>
</ControlTemplate>
</Setter>
<Style Selector="^[AllowMultiple=False]">
<Style Selector="^ /template/ Button#PART_Button">
<Setter Property="DockPanel.Dock" Value="Right"></Setter>
</Style>
<Style Selector="^ /template/ TextBox#PART_TextBox">
<Setter Property="DockPanel.Dock" Value="Left"></Setter>
</Style>
<Style Selector="^ /template/ Button#PART_Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" />
</Style>
<Style Selector="^[AllowMultiple=True]">
<Style Selector="^ /template/ Button#PART_Button">
<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 Selector="^ /template/ TextBox#PART_TextBox">
<Setter Property="DockPanel.Dock" Value="Left" />
<Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={x:Static converters:CornerRadiusTakeConverter.Left}}" />
</Style>
<Style Selector="^.Top">
<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 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>
</ControlTheme>
<ControlTheme x:Key="PathPickerOnlyButton" TargetType="ursa:PathPicker">
<ControlTheme x:Key="ButtonPathPicker" TargetType="u:PathPicker">
<Setter Property="Template">
<ControlTemplate>
<Button Name="PART_Button"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Content="{TemplateBinding Title}">
</Button>
<Button
Name="{x:Static u:PathPicker.PART_Button}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Content="{TemplateBinding Title}" />
</ControlTemplate>
</Setter>
<Style Selector="^ /template/ Button#PART_Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" />
</Style>
</ControlTheme>
<ControlTheme x:Key="PathPickerForListView" TargetType="ursa:PathPicker">
<ControlTheme x:Key="ListPathPicker" TargetType="u:PathPicker">
<Setter Property="CornerRadius" Value="3" />
<Setter Property="Template">
<ControlTemplate>
<Expander HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}">
<Expander
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
CornerRadius="{TemplateBinding CornerRadius}"
Theme="{StaticResource INTERNAL_PathPickerExpander}">
<Expander.Header>
<Button Name="PART_Button"
HorizontalAlignment="Stretch"
Content="{TemplateBinding Title}">
<Button.Theme>
<ControlTheme TargetType="Button">
<Setter Property="Template">
<ControlTemplate>
<TextPresenter Text="{TemplateBinding Content}"
Background="Transparent"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
</TextPresenter>
</ControlTemplate>
</Setter>
</ControlTheme>
</Button.Theme>
</Button>
<Button
Name="PART_Button"
HorizontalAlignment="Stretch"
Content="{TemplateBinding Title}"
CornerRadius="{TemplateBinding CornerRadius,
Converter={x:Static converters:CornerRadiusTakeConverter.Left}}" />
</Expander.Header>
<ListBox ItemsSource="{TemplateBinding SelectedPaths}"></ListBox>
<ListBox ItemsSource="{TemplateBinding SelectedPaths}" />
</Expander>
</ControlTemplate>
</Setter>
<Style Selector="^ /template/ Button#PART_Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" />
</Style>
</ControlTheme>
<ControlTheme x:Key="INTERNAL_PathPickerExpander" TargetType="Expander">
<Setter Property="Template">
<ControlTemplate>
<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>
</Setter>
</ControlTheme>
</ResourceDictionary>

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

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