tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rework/rename PseudoClasses to match standards

pull/7422/head
robloo 5 years ago
parent
7bdee77bf3
commit
aa46b05881
3 changed files with 81 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      src/Avalonia.Controls/SplitButton/SplitButton.cs
  2. 18
      src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
  3. 104
      src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml

58
src/Avalonia.Controls/SplitButton/SplitButton.cs
View File

@ -15,21 +15,21 @@ namespace Avalonia.Controls
/// </summary>
[PseudoClasses(
":disabled",
":secondaryButtonRight",
":secondaryButtonSpan",
":checkedFlyoutOpen",
":flyoutOpen",
":checkedTouchPressed",
":secondary-button-right",
":secondary-button-span",
":checked-flyout-open",
":flyout-open",
":checked-touch-pressed",
":checked",
":checkedPrimaryPressed",
":checkedPrimaryPointerOver",
":checkedSecondaryPressed",
":checkedSecondaryPointerOver",
":touchPressed",
":primaryPressed",
":primaryPointerOver",
":secondaryPressed",
":secondaryPointerOver")]
":checked-primary-pressed",
":checked-primary-pointerover",
":checked-secondary-pressed",
":checked-secondary-pointerover",
":touch-pressed",
":primary-pressed",
":primary-pointerover",
":secondary-pressed",
":secondary-pointerover")]
public class SplitButton : ContentControl, ICommandSource
{
/// <summary>
@ -167,24 +167,24 @@ namespace Avalonia.Controls
string pcNormal = ":normal"; // Not supported in XAML style
string pcDisabled = ":disabled";
string pcSecondaryButtonRight = ":secondaryButtonRight";
string pcSecondaryButtonSpan = ":secondaryButtonSpan";
string pcSecondaryButtonRight = ":secondary-button-right";
string pcSecondaryButtonSpan = ":secondary-button-span";
string pcCheckedFlyoutOpen = ":checkedFlyoutOpen";
string pcFlyoutOpen = ":flyoutOpen";
string pcCheckedFlyoutOpen = ":checked-flyout-open";
string pcFlyoutOpen = ":flyout-open";
string pcCheckedTouchPressed = ":checkedTouchPressed";
string pcCheckedTouchPressed = ":checked-touch-pressed";
string pcChecked = ":checked";
string pcCheckedPrimaryPressed = ":checkedPrimaryPressed";
string pcCheckedPrimaryPointerOver = ":checkedPrimaryPointerOver";
string pcCheckedSecondaryPressed = ":checkedSecondaryPressed";
string pcCheckedSecondaryPointerOver = ":checkedSecondaryPointerOver";
string pcTouchPressed = ":touchPressed";
string pcPrimaryPressed = ":primaryPressed";
string pcPrimaryPointerOver = ":primaryPointerOver";
string pcSecondaryPressed = ":secondaryPressed";
string pcSecondaryPointerOver = ":secondaryPointerOver";
string pcCheckedPrimaryPressed = ":checked-primary-pressed";
string pcCheckedPrimaryPointerOver = ":checked-primary-pointerover";
string pcCheckedSecondaryPressed = ":checked-secondary-pressed";
string pcCheckedSecondaryPointerOver = ":checked-secondary-pointerover";
string pcTouchPressed = ":touch-pressed";
string pcPrimaryPressed = ":primary-pressed";
string pcPrimaryPointerOver = ":primary-pointerover";
string pcSecondaryPressed = ":secondary-pressed";
string pcSecondaryPointerOver = ":secondary-pointerover";
// Place the secondary button
// These are mutually exclusive PseudoClasses handled separately from SetExclusivePseudoClass().

18
src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
View File

@ -1,5 +1,4 @@
using System;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Interactivity;
using Avalonia.Styling;
@ -11,23 +10,6 @@ namespace Avalonia.Controls
/// The primary part behaves like a <see cref="ToggleButton"/> with two states and
/// the secondary part opens a flyout.
/// </summary>
[PseudoClasses(
":disabled",
":secondaryButtonRight",
":secondaryButtonSpan",
":checkedFlyoutOpen",
":flyoutOpen",
":checkedTouchPressed",
":checked",
":checkedPrimaryPressed",
":checkedPrimaryPointerOver",
":checkedSecondaryPressed",
":checkedSecondaryPointerOver",
":touchPressed",
":primaryPressed",
":primaryPointerOver",
":secondaryPressed",
":secondaryPointerOver")]
public class ToggleSplitButton : SplitButton, IStyleable
{
/// <summary>

104
src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
View File

@ -153,83 +153,83 @@
</Style>
<!-- FlyoutOpen State -->
<Style Selector="SplitButton:flyoutOpen /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:flyout-open /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPressed}" />
</Style>
<Style Selector="SplitButton:flyoutOpen /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:flyout-open /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPressed}" />
</Style>
<Style Selector="SplitButton:flyoutOpen /template/ Border#Border">
<Style Selector="SplitButton:flyout-open /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
</Style>
<Style Selector="SplitButton:flyoutOpen /template/ Button#PrimaryButton">
<Style Selector="SplitButton:flyout-open /template/ Button#PrimaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
</Style>
<Style Selector="SplitButton:flyoutOpen /template/ Button#SecondaryButton">
<Style Selector="SplitButton:flyout-open /template/ Button#SecondaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
</Style>
<!-- TouchPressed State -->
<Style Selector="SplitButton:touchPressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:touch-pressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPressed}" />
</Style>
<Style Selector="SplitButton:touchPressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:touch-pressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPressed}" />
</Style>
<Style Selector="SplitButton:touchPressed /template/ Border#Border">
<Style Selector="SplitButton:touch-pressed /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
</Style>
<Style Selector="SplitButton:touchPressed /template/ Button#PrimaryButton">
<Style Selector="SplitButton:touch-pressed /template/ Button#PrimaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
</Style>
<Style Selector="SplitButton:touchPressed /template/ Button#SecondaryButton">
<Style Selector="SplitButton:touch-pressed /template/ Button#SecondaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
</Style>
<!-- PrimaryPointerOver State -->
<Style Selector="SplitButton:primaryPointerOver /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:primary-pointerover /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
</Style>
<Style Selector="SplitButton:primaryPointerOver /template/ Button#PrimaryButton">
<Style Selector="SplitButton:primary-pointerover /template/ Button#PrimaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
</Style>
<Style Selector="SplitButton:primaryPointerOver /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:primary-pointerover /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackground}" />
</Style>
<!-- PrimaryPressed State -->
<Style Selector="SplitButton:primaryPressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:primary-pressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPressed}" />
</Style>
<Style Selector="SplitButton:primaryPressed /template/ Button#PrimaryButton">
<Style Selector="SplitButton:primary-pressed /template/ Button#PrimaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
</Style>
<Style Selector="SplitButton:primaryPressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:primary-pressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackground}" />
</Style>
<!-- SecondaryPointerOver State -->
<Style Selector="SplitButton:secondaryPointerOver /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:secondary-pointerover /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackground}" />
</Style>
<Style Selector="SplitButton:secondaryPointerOver /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:secondary-pointerover /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
</Style>
<Style Selector="SplitButton:secondaryPointerOver /template/ Button#SecondaryButton">
<Style Selector="SplitButton:secondary-pointerover /template/ Button#SecondaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
</Style>
<!-- SecondaryPressed State -->
<Style Selector="SplitButton:secondaryPressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:secondary-pressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackground}" />
</Style>
<Style Selector="SplitButton:secondaryPressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:secondary-pressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundPressed}" />
</Style>
<Style Selector="SplitButton:secondaryPressed /template/ Button#SecondaryButton">
<Style Selector="SplitButton:secondary-pressed /template/ Button#SecondaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
</Style>
@ -252,107 +252,107 @@
</Style>
<!-- CheckedFlyoutOpen State -->
<Style Selector="SplitButton:checkedFlyoutOpen /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:checked-flyout-open /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedFlyoutOpen /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:checked-flyout-open /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedFlyoutOpen /template/ Border#Border">
<Style Selector="SplitButton:checked-flyout-open /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedFlyoutOpen /template/ Button#PrimaryButton">
<Style Selector="SplitButton:checked-flyout-open /template/ Button#PrimaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedFlyoutOpen /template/ Button#SecondaryButton">
<Style Selector="SplitButton:checked-flyout-open /template/ Button#SecondaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
</Style>
<!-- CheckedTouchPressed State -->
<Style Selector="SplitButton:checkedTouchPressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:checked-touch-pressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedTouchPressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:checked-touch-pressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedTouchPressed /template/ Border#Border">
<Style Selector="SplitButton:checked-touch-pressed /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedTouchPressed /template/ Button#PrimaryButton">
<Style Selector="SplitButton:checked-touch-pressed /template/ Button#PrimaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedTouchPressed /template/ Button#SecondaryButton">
<Style Selector="SplitButton:checked-touch-pressed /template/ Button#SecondaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
</Style>
<!-- CheckedPrimaryPointerOver State -->
<Style Selector="SplitButton:checkedPrimaryPointerOver /template/ Border#Border">
<Style Selector="SplitButton:checked-primary-pointerover /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPointerOver /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:checked-primary-pointerover /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPointerOver /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:checked-primary-pointerover /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundChecked}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPointerOver /template/ Button#PrimaryButton">
<Style Selector="SplitButton:checked-primary-pointerover /template/ Button#PrimaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPointerOver /template/ Button#SecondaryButton">
<Style Selector="SplitButton:checked-primary-pointerover /template/ Button#SecondaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
</Style>
<!-- CheckedPrimaryPressed State -->
<Style Selector="SplitButton:checkedPrimaryPressed /template/ Border#Border">
<Style Selector="SplitButton:checked-primary-pressed /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:checked-primary-pressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:checked-primary-pressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundChecked}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPressed /template/ Button#PrimaryButton">
<Style Selector="SplitButton:checked-primary-pressed /template/ Button#PrimaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedPrimaryPressed /template/ Button#SecondaryButton">
<Style Selector="SplitButton:checked-primary-pressed /template/ Button#SecondaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
</Style>
<!-- CheckedSecondaryPointerOver State -->
<Style Selector="SplitButton:checkedSecondaryPointerOver /template/ Border#Border">
<Style Selector="SplitButton:checked-secondary-pointerover /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPointerOver /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:checked-secondary-pointerover /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundChecked}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPointerOver /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:checked-secondary-pointerover /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPointerOver /template/ Button#PrimaryButton">
<Style Selector="SplitButton:checked-secondary-pointerover /template/ Button#PrimaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPointerOver /template/ Button#SecondaryButton">
<Style Selector="SplitButton:checked-secondary-pointerover /template/ Button#SecondaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
</Style>
<!-- CheckedSecondaryPressed State -->
<Style Selector="SplitButton:checkedSecondaryPressed /template/ Border#Border">
<Style Selector="SplitButton:checked-secondary-pressed /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Style Selector="SplitButton:checked-secondary-pressed /template/ Rectangle#PrimaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundChecked}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Style Selector="SplitButton:checked-secondary-pressed /template/ Rectangle#SecondaryBackgroundRectangle">
<Setter Property="Fill" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPressed /template/ Button#PrimaryButton">
<Style Selector="SplitButton:checked-secondary-pressed /template/ Button#PrimaryButton">
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
</Style>
<Style Selector="SplitButton:checkedSecondaryPressed /template/ Button#SecondaryButton">
<Style Selector="SplitButton:checked-secondary-pressed /template/ Button#SecondaryButton">
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
</Style>

Write Preview
Loading…
Cancel
Save