Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 9f70ca9

Browse files
committed
Restyle Expander button.
Use the same triangle as used elsewhere (e.g. in `SectionControl`).
1 parent 57ca891 commit 9f70ca9

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

src/GitHub.UI/Assets/Controls.xaml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,10 @@
424424
<!-- Expander -->
425425

426426
<!--
427-
A toggle button that displays a triangle expander icon for use in an Expander.
428-
Note that when the button is disabled, the triangle expander is hidden. This is because
429-
this is the behavior we want in the only place where we use disabled expanders currently
430-
(PullRequestUserReviewsView).
427+
A toggle button that displays a triangle expander for use in an Expander. Note that when
428+
the button is disabled, the triangle expander is hidden. This is because this is the
429+
behavior we want in the only place where we use disabled expanders currently (in
430+
PullRequestUserReviewsView).
431431
-->
432432
<Style x:Key="TriangleToggleButton" TargetType="{x:Type ToggleButton}">
433433
<Setter Property="Template">
@@ -436,13 +436,18 @@
436436
<Border Background="{TemplateBinding Background}"
437437
Padding="{TemplateBinding Padding}">
438438
<DockPanel>
439-
<ui:OcticonImage x:Name="arrow"
440-
DockPanel.Dock="Left"
441-
Height="10"
442-
Margin="5,0,0,0"
443-
Icon="triangle_right"
444-
Foreground="{TemplateBinding Foreground}"
445-
Visibility="{TemplateBinding IsEnabled, Converter={ui:BooleanToHiddenVisibilityConverter}}"/>
439+
<Border Background="Transparent" Width="10" Margin="5,0">
440+
<Path Name="arrow"
441+
DockPanel.Dock="Left"
442+
Fill="{TemplateBinding Foreground}"
443+
Height="7"
444+
Width="7"
445+
VerticalAlignment="Center"
446+
HorizontalAlignment="Center"
447+
Stretch="UniformToFill"
448+
Data="M7 1l-.025 5H2z"
449+
Visibility="{TemplateBinding IsEnabled, Converter={ui:BooleanToHiddenVisibilityConverter}}"/>
450+
</Border>
446451
<ContentPresenter Margin="0"
447452
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
448453
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -452,8 +457,12 @@
452457
</Border>
453458

454459
<ControlTemplate.Triggers>
455-
<Trigger Property="IsChecked" Value="True">
456-
<Setter TargetName="arrow" Property="Icon" Value="triangle_down" />
460+
<Trigger Property="IsChecked" Value="False">
461+
<Setter TargetName="arrow" Property="LayoutTransform">
462+
<Setter.Value>
463+
<RotateTransform Angle="-45" />
464+
</Setter.Value>
465+
</Setter>
457466
</Trigger>
458467
</ControlTemplate.Triggers>
459468
</ControlTemplate>

0 commit comments

Comments
 (0)