amwx
6 years ago
24 changed files with 803 additions and 166 deletions
@ -0,0 +1,37 @@ |
|||
using Avalonia.Interactivity; |
|||
using Avalonia.Input; |
|||
|
|||
namespace Avalonia.Controls.Mixins |
|||
{ |
|||
/// <summary>
|
|||
/// Adds pressed functionality to control classes.
|
|||
///
|
|||
/// Adds the ':pressed' class when the item is pressed.
|
|||
/// </summary>
|
|||
public static class PressedMixin |
|||
{ |
|||
/// <summary>
|
|||
/// Initializes a new instance of the <see cref="PressedMixin"/> class.
|
|||
/// </summary>
|
|||
/// <typeparam name="TControl">The control type.</typeparam>
|
|||
public static void Attach<TControl>() where TControl : Control |
|||
{ |
|||
InputElement.PointerPressedEvent.AddClassHandler<TControl>((x, e) => HandlePointerPressed(x, e), RoutingStrategies.Tunnel); |
|||
InputElement.PointerReleasedEvent.AddClassHandler<TControl>((x, e) => HandlePointerReleased(x), RoutingStrategies.Tunnel); |
|||
InputElement.PointerCaptureLostEvent.AddClassHandler<TControl>((x, e) => HandlePointerReleased(x), RoutingStrategies.Tunnel); |
|||
} |
|||
|
|||
private static void HandlePointerPressed<TControl>(TControl sender, PointerPressedEventArgs e) where TControl : Control |
|||
{ |
|||
if (e.GetCurrentPoint(sender).Properties.IsLeftButtonPressed) |
|||
{ |
|||
((IPseudoClasses)sender.Classes).Set(":pressed", true); |
|||
} |
|||
} |
|||
|
|||
private static void HandlePointerReleased<TControl>(TControl sender) where TControl : Control |
|||
{ |
|||
((IPseudoClasses)sender.Classes).Set(":pressed", false); |
|||
} |
|||
} |
|||
} |
|||
@ -1,31 +1,43 @@ |
|||
<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|||
<Style Selector="ListBox"> |
|||
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/> |
|||
<Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/> |
|||
<Setter Property="Padding" Value="4"/> |
|||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/> |
|||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Border Name="border" BorderBrush="{TemplateBinding BorderBrush}" |
|||
BorderThickness="{TemplateBinding BorderThickness}"> |
|||
<ScrollViewer Name="PART_ScrollViewer" |
|||
Background="{TemplateBinding Background}" |
|||
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" |
|||
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> |
|||
<ItemsPresenter Name="PART_ItemsPresenter" |
|||
Items="{TemplateBinding Items}" |
|||
ItemsPanel="{TemplateBinding ItemsPanel}" |
|||
ItemTemplate="{TemplateBinding ItemTemplate}" |
|||
Margin="{TemplateBinding Padding}" |
|||
VirtualizationMode="{TemplateBinding VirtualizationMode}"/> |
|||
</ScrollViewer> |
|||
</Border> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
<Style Selector="ListBox:disabled /template/ Border#border"> |
|||
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" /> |
|||
</Style> |
|||
<Design.PreviewWith> |
|||
<Border Padding="20"> |
|||
<ListBox> |
|||
<ListBoxItem>Test</ListBoxItem> |
|||
<ListBoxItem>Test</ListBoxItem> |
|||
<ListBoxItem>Test</ListBoxItem> |
|||
<ListBoxItem>Test</ListBoxItem> |
|||
</ListBox> |
|||
</Border> |
|||
</Design.PreviewWith> |
|||
<Style Selector="ListBox"> |
|||
<Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" /> |
|||
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" /> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" /> |
|||
<Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" /> |
|||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" /> |
|||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" /> |
|||
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" /> |
|||
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" /> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Border Name="border" BorderBrush="{TemplateBinding BorderBrush}" |
|||
BorderThickness="{TemplateBinding BorderThickness}"> |
|||
<ScrollViewer Name="PART_ScrollViewer" |
|||
Background="{TemplateBinding Background}" |
|||
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" |
|||
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> |
|||
<ItemsPresenter Name="PART_ItemsPresenter" |
|||
Items="{TemplateBinding Items}" |
|||
ItemsPanel="{TemplateBinding ItemsPanel}" |
|||
ItemTemplate="{TemplateBinding ItemTemplate}" |
|||
Margin="{TemplateBinding Padding}" |
|||
VirtualizationMode="{TemplateBinding VirtualizationMode}"/> |
|||
</ScrollViewer> |
|||
</Border> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
<Style Selector="ListBox:disabled /template/ Border#border"> |
|||
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" /> |
|||
</Style> |
|||
</Styles> |
|||
|
|||
@ -1,17 +1,21 @@ |
|||
<Style xmlns="https://github.com/avaloniaui" Selector="PopupRoot"> |
|||
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Panel> |
|||
<Border Name="PART_TransparencyFallback" IsHitTestVisible="False" /> |
|||
<VisualLayerManager IsPopup="True"> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Background="{TemplateBinding Background}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Padding="{TemplateBinding Padding}"/> |
|||
</VisualLayerManager> |
|||
</Panel> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
<Styles xmlns="https://github.com/avaloniaui" |
|||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|||
<Style Selector="PopupRoot"> |
|||
<Setter Property="TransparencyLevelHint" Value="Transparent" /> |
|||
<Setter Property="Background" Value="{x:Null}" /> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Panel> |
|||
<Border Name="PART_TransparencyFallback" IsHitTestVisible="False" /> |
|||
<VisualLayerManager IsPopup="True"> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Background="{TemplateBinding Background}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Padding="{TemplateBinding Padding}"/> |
|||
</VisualLayerManager> |
|||
</Panel> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
</Styles> |
|||
|
|||
@ -1,60 +1,173 @@ |
|||
<Styles xmlns="https://github.com/avaloniaui"> |
|||
<Design.PreviewWith> |
|||
<Border Padding="20"> |
|||
<StackPanel Spacing="10"> |
|||
<RadioButton Content="Option 1" /> |
|||
<RadioButton Content="Option 2" /> |
|||
<RadioButton IsEnabled="False" Content="Option 3" /> |
|||
<RadioButton Content="Option 2" /> |
|||
</StackPanel> |
|||
</Border> |
|||
</Design.PreviewWith> |
|||
<Style Selector="RadioButton"> |
|||
<Setter Property="Background" Value="Transparent"/> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/> |
|||
<Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/> |
|||
<Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" /> |
|||
<Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" /> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" /> |
|||
<Setter Property="Padding" Value="8,6,0,0" /> |
|||
<Setter Property="HorizontalAlignment" Value="Left" /> |
|||
<Setter Property="VerticalAlignment" Value="Center" /> |
|||
<Setter Property="HorizontalContentAlignment" Value="Left" /> |
|||
<Setter Property="VerticalContentAlignment" Value="Top" /> |
|||
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" /> |
|||
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" /> |
|||
<Setter Property="MinWidth" Value="120" /> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Grid ColumnDefinitions="Auto,*" Background="{TemplateBinding Background}"> |
|||
<Ellipse Name="border" |
|||
Stroke="{TemplateBinding BorderBrush}" |
|||
StrokeThickness="1" |
|||
Width="18" |
|||
Height="18" |
|||
VerticalAlignment="Center"/> |
|||
<Ellipse Name="checkMark" |
|||
Width="10" |
|||
Height="10" |
|||
Stretch="Uniform" |
|||
UseLayoutRounding="False" |
|||
HorizontalAlignment="Center" |
|||
VerticalAlignment="Center"/> |
|||
<Ellipse Name="indeterminateMark" |
|||
Fill="{DynamicResource ThemeAccentBrush}" |
|||
Width="10" |
|||
Height="10" |
|||
Stretch="Uniform" |
|||
UseLayoutRounding="False" |
|||
HorizontalAlignment="Center" |
|||
VerticalAlignment="Center"/> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Margin="4,0,0,0" |
|||
VerticalAlignment="Center" |
|||
Grid.Column="1"/> |
|||
</Grid> |
|||
<ControlTemplate TargetType="RadioButton"> |
|||
<Border Name="RootBorder" |
|||
Background="{TemplateBinding Background}" |
|||
BorderBrush="{TemplateBinding BorderBrush}" |
|||
BorderThickness="{TemplateBinding BorderThickness}" |
|||
CornerRadius="{DynamicResource ControlCornerRadius}"> |
|||
<Grid ColumnDefinitions="20,*"> |
|||
<Grid VerticalAlignment="Top" |
|||
Height="32"> |
|||
|
|||
<Ellipse Name="OuterEllipse" |
|||
Width="20" Height="20" |
|||
UseLayoutRounding="False" |
|||
StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" /> |
|||
|
|||
<Ellipse Name="CheckOuterEllipse" |
|||
Width="20" Height="20" |
|||
UseLayoutRounding="False" |
|||
StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" /> |
|||
|
|||
<Ellipse Name="CheckGlyph" |
|||
Width="8" Height="8" |
|||
UseLayoutRounding="False" /> |
|||
</Grid> |
|||
|
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Content="{TemplateBinding Content}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
TextBlock.Foreground="{TemplateBinding Foreground}" |
|||
Margin="{TemplateBinding Padding}" |
|||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" |
|||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" |
|||
Grid.Column="1" /> |
|||
</Grid> |
|||
</Border> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pointerover /template/ Ellipse#border"> |
|||
<Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}"/> |
|||
|
|||
<!-- Normal State --> |
|||
<Style Selector="RadioButton /template/ Ellipse#OuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStroke}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFill}" /> |
|||
</Style> |
|||
<Style Selector="RadioButton /template/ Ellipse#checkMark"> |
|||
<Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/> |
|||
<Setter Property="IsVisible" Value="False"/> |
|||
|
|||
<Style Selector="RadioButton /template/ Ellipse#CheckOuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStroke}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFill}" /> |
|||
<Setter Property="Opacity" Value="0" /> |
|||
</Style> |
|||
<Style Selector="RadioButton /template/ Ellipse#indeterminateMark"> |
|||
<Setter Property="IsVisible" Value="False"/> |
|||
|
|||
<Style Selector="RadioButton /template/ Ellipse#CheckGlyph"> |
|||
<Setter Property="Opacity" Value="0" /> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" /> |
|||
</Style> |
|||
<Style Selector="RadioButton:checked /template/ Ellipse#checkMark"> |
|||
<Setter Property="IsVisible" Value="True"/> |
|||
|
|||
|
|||
<!-- PointerOver State --> |
|||
<Style Selector="RadioButton:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
|||
<Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPointerOver}" /> |
|||
</Style> |
|||
<Style Selector="RadioButton:indeterminate /template/ Ellipse#indeterminateMark"> |
|||
<Setter Property="IsVisible" Value="True"/> |
|||
|
|||
<Style Selector="RadioButton:pointerover /template/ Border#RootBorder"> |
|||
<Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" /> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" /> |
|||
</Style> |
|||
<Style Selector="RadioButton:disabled /template/ Ellipse#border"> |
|||
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/> |
|||
|
|||
<Style Selector="RadioButton:pointerover /template/ Ellipse#OuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePointerOver}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pointerover /template/ Ellipse#CheckOuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pointerover /template/ Ellipse#CheckGlyph"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" /> |
|||
</Style> |
|||
|
|||
|
|||
<!-- Pressed State --> |
|||
<Style Selector="RadioButton:pressed /template/ ContentPresenter#PART_ContentPresenter"> |
|||
<Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPressed}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pressed /template/ Border#RootBorder"> |
|||
<Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" /> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pressed /template/ Ellipse#OuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pressed /template/ Ellipse#CheckOuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:pressed /template/ Ellipse#CheckGlyph"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" /> |
|||
</Style> |
|||
|
|||
|
|||
<!-- Disabled State --> |
|||
<Style Selector="RadioButton:disabled /template/ ContentPresenter#PART_ContentPresenter"> |
|||
<Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundDisabled}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:disabled /template/ Border#RootBorder"> |
|||
<Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" /> |
|||
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:disabled /template/ Ellipse#OuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:disabled /template/ Ellipse#CheckOuterEllipse"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:disabled /template/ Ellipse#CheckGlyph"> |
|||
<Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" /> |
|||
<Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" /> |
|||
</Style> |
|||
|
|||
|
|||
<!-- Checked State --> |
|||
<Style Selector="RadioButton:checked /template/ Ellipse#CheckGlyph"> |
|||
<Setter Property="Opacity" Value="1" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:checked /template/ Ellipse#OuterEllipse"> |
|||
<Setter Property="Opacity" Value="0" /> |
|||
</Style> |
|||
|
|||
<Style Selector="RadioButton:checked /template/ Ellipse#CheckOuterEllipse"> |
|||
<Setter Property="Opacity" Value="1" /> |
|||
</Style> |
|||
</Styles> |
|||
|
|||
@ -0,0 +1,37 @@ |
|||
using Avalonia.Controls.Mixins; |
|||
using Avalonia.UnitTests; |
|||
using Xunit; |
|||
|
|||
namespace Avalonia.Controls.UnitTests.Mixins |
|||
{ |
|||
public class PressedMixinTests |
|||
{ |
|||
private MouseTestHelper _mouse = new MouseTestHelper(); |
|||
|
|||
[Fact] |
|||
public void Selected_Class_Should_Not_Initially_Be_Added() |
|||
{ |
|||
var target = new TestControl(); |
|||
|
|||
Assert.Empty(target.Classes); |
|||
} |
|||
|
|||
[Fact] |
|||
public void Setting_IsSelected_Should_Add_Selected_Class() |
|||
{ |
|||
var target = new TestControl(); |
|||
|
|||
_mouse.Down(target); |
|||
|
|||
Assert.Equal(new[] { ":pressed" }, target.Classes); |
|||
} |
|||
|
|||
private class TestControl : Control |
|||
{ |
|||
static TestControl() |
|||
{ |
|||
PressedMixin.Attach<TestControl>(); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue