Browse Source

Standardize CaptionButtons to Minimize/Maximize spelling

pull/11361/head
robloo 3 years ago
parent
commit
a0f70f4b02
  1. 6
      src/Avalonia.Controls/Chrome/CaptionButtons.cs
  2. 8
      src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
  3. 8
      src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
  4. 2
      tests/Avalonia.IntegrationTests.Appium/WindowTests.cs

6
src/Avalonia.Controls/Chrome/CaptionButtons.cs

@ -10,7 +10,7 @@ namespace Avalonia.Controls.Chrome
/// </summary> /// </summary>
[TemplatePart("PART_CloseButton", typeof(Button))] [TemplatePart("PART_CloseButton", typeof(Button))]
[TemplatePart("PART_RestoreButton", typeof(Button))] [TemplatePart("PART_RestoreButton", typeof(Button))]
[TemplatePart("PART_MinimiseButton", typeof(Button))] [TemplatePart("PART_MinimizeButton", typeof(Button))]
[TemplatePart("PART_FullScreenButton", typeof(Button))] [TemplatePart("PART_FullScreenButton", typeof(Button))]
[PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")] [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
public class CaptionButtons : TemplatedControl public class CaptionButtons : TemplatedControl
@ -97,12 +97,12 @@ namespace Avalonia.Controls.Chrome
var closeButton = e.NameScope.Get<Button>("PART_CloseButton"); var closeButton = e.NameScope.Get<Button>("PART_CloseButton");
var restoreButton = e.NameScope.Get<Button>("PART_RestoreButton"); var restoreButton = e.NameScope.Get<Button>("PART_RestoreButton");
var minimiseButton = e.NameScope.Get<Button>("PART_MinimiseButton"); var minimizeButton = e.NameScope.Get<Button>("PART_MinimizeButton");
var fullScreenButton = e.NameScope.Get<Button>("PART_FullScreenButton"); var fullScreenButton = e.NameScope.Get<Button>("PART_FullScreenButton");
closeButton.Click += (sender, e) => OnClose(); closeButton.Click += (sender, e) => OnClose();
restoreButton.Click += (sender, e) => OnRestore(); restoreButton.Click += (sender, e) => OnRestore();
minimiseButton.Click += (sender, e) => OnMinimize(); minimizeButton.Click += (sender, e) => OnMinimize();
fullScreenButton.Click += (sender, e) => OnToggleFullScreen(); fullScreenButton.Click += (sender, e) => OnToggleFullScreen();
restoreButton.IsEnabled = HostWindow?.CanResize ?? true; restoreButton.IsEnabled = HostWindow?.CanResize ?? true;

8
src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml

@ -47,9 +47,9 @@
Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" /> Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
</Viewbox> </Viewbox>
</Button> </Button>
<Button x:Name="PART_MinimiseButton" <Button x:Name="PART_MinimizeButton"
Theme="{StaticResource FluentCaptionButton}" Theme="{StaticResource FluentCaptionButton}"
AutomationProperties.Name="Minimise"> AutomationProperties.Name="Minimize">
<Viewbox Width="11" Margin="2"> <Viewbox Width="11" Margin="2">
<Path Stretch="UniformToFill" <Path Stretch="UniformToFill"
Fill="{TemplateBinding Foreground}" Fill="{TemplateBinding Foreground}"
@ -58,7 +58,7 @@
</Button> </Button>
<Button x:Name="PART_RestoreButton" <Button x:Name="PART_RestoreButton"
Theme="{StaticResource FluentCaptionButton}" Theme="{StaticResource FluentCaptionButton}"
AutomationProperties.Name="Maximise"> AutomationProperties.Name="Maximize">
<Viewbox Width="11" Margin="2"> <Viewbox Width="11" Margin="2">
<Viewbox.RenderTransform> <Viewbox.RenderTransform>
<RotateTransform Angle="-90" /> <RotateTransform Angle="-90" />
@ -93,7 +93,7 @@
<Style Selector="^:fullscreen /template/ Button#PART_RestoreButton"> <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
<Style Selector="^:fullscreen /template/ Button#PART_MinimiseButton"> <Style Selector="^:fullscreen /template/ Button#PART_MinimizeButton">
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
<Style Selector="^ /template/ Button#PART_RestoreButton:disabled"> <Style Selector="^ /template/ Button#PART_RestoreButton:disabled">

8
src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml

@ -53,9 +53,9 @@
Stretch="UniformToFill" /> Stretch="UniformToFill" />
</Viewbox> </Viewbox>
</Button> </Button>
<Button x:Name="PART_MinimiseButton" <Button x:Name="PART_MinimizeButton"
Theme="{StaticResource SimpleCaptionButton}" Theme="{StaticResource SimpleCaptionButton}"
AutomationProperties.Name="Minimise"> AutomationProperties.Name="Minimize">
<Viewbox Width="11" <Viewbox Width="11"
Margin="2"> Margin="2">
<Path Data="M2048 1229v-205h-2048v205h2048z" <Path Data="M2048 1229v-205h-2048v205h2048z"
@ -65,7 +65,7 @@
</Button> </Button>
<Button x:Name="PART_RestoreButton" <Button x:Name="PART_RestoreButton"
Theme="{StaticResource SimpleCaptionButton}" Theme="{StaticResource SimpleCaptionButton}"
AutomationProperties.Name="Maximise"> AutomationProperties.Name="Maximize">
<Viewbox Width="11" <Viewbox Width="11"
Margin="2"> Margin="2">
<Viewbox.RenderTransform> <Viewbox.RenderTransform>
@ -102,7 +102,7 @@
<Style Selector="^:fullscreen /template/ Button#PART_RestoreButton"> <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
<Style Selector="^:fullscreen /template/ Button#PART_MinimiseButton"> <Style Selector="^:fullscreen /template/ Button#PART_MinimizeButton">
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
<Style Selector="^ /template/ Button#PART_RestoreButton:disabled"> <Style Selector="^ /template/ Button#PART_RestoreButton:disabled">

2
tests/Avalonia.IntegrationTests.Appium/WindowTests.cs

@ -263,7 +263,7 @@ namespace Avalonia.IntegrationTests.Appium
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
maximizeButton = extendClientArea ? maximizeButton = extendClientArea ?
secondaryWindow.FindElementByXPath("//Button[@Name='Maximise']") : secondaryWindow.FindElementByXPath("//Button[@Name='Maximize']") :
secondaryWindow.FindElementByXPath("//TitleBar/Button[2]"); secondaryWindow.FindElementByXPath("//TitleBar/Button[2]");
} }
else else

Loading…
Cancel
Save