Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: No contrast of the CopyButton in the color guidance page #1554

Merged
merged 7 commits into from
Jun 19, 2024
Merged

Fix: No contrast of the CopyButton in the color guidance page #1554

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b94a20
Add exponent settings to easing function page
HO-COOH Dec 16, 2023
6c14da6
Empty commit trigger build
HO-COOH Jan 18, 2024
862eb21
Merge branch 'microsoft:main' into main
HO-COOH Feb 4, 2024
449c4c7
Fix no contrast of CopyButton in color guidance page
HO-COOH May 26, 2024
9279e38
Try reusing CopyButton template
HO-COOH Jun 13, 2024
366c227
Merge branch 'main' into fix/color-guideline-copybutton
HO-COOH Jun 13, 2024
b08fd96
Remove duplicate content in CopyButton
HO-COOH Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions WinUIGallery/Controls/CopyButton/CopyButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Style x:Key="DefaultCopyButtonStyle" TargetType="local:CopyButton">
<Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
<Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
<Setter Property="Foreground" Value="{x:Null}" />
<Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}" />
<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
<Setter Property="Padding" Value="6" />
Expand Down Expand Up @@ -129,31 +129,6 @@
<BrushTransition Duration="0:0:0.083" />
</Grid.BackgroundTransition>

<ContentPresenter
x:Name="ContentPresenter"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTransitions="{TemplateBinding ContentTransitions}"
FontFamily="{TemplateBinding FontFamily}"
FontSize="{TemplateBinding FontSize}"
Foreground="{TemplateBinding Foreground}"
RenderTransformOrigin=".5,.5">
<ContentPresenter.RenderTransform>
<ScaleTransform x:Name="CopyToClipboardTextScaleTransform" />
</ContentPresenter.RenderTransform>
</ContentPresenter>
<ContentPresenter
x:Name="CopySuccessGlyph"
Foreground="{TemplateBinding Foreground}"
Opacity="0"
RenderTransformOrigin=".5,.5">
<ContentPresenter.RenderTransform>
<ScaleTransform x:Name="CopyToClipboardSuccessTextScaleTransform" />
</ContentPresenter.RenderTransform>
<FontIcon FontSize="{TemplateBinding FontSize}" Glyph="&#xE73E;" />
</ContentPresenter>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
Expand All @@ -166,10 +141,10 @@
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPointerOver}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPointerOver}" />
<DiscreteObjectKeyFrame KeyTime="0" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, TargetNullValue={ThemeResource ButtonForegroundPointerOver}}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="CopySuccessGlyph" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPointerOver}" />
<DiscreteObjectKeyFrame KeyTime="0" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, TargetNullValue={ThemeResource ButtonForegroundPointerOver}}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
<VisualState.Setters>
Expand All @@ -186,10 +161,10 @@
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPressed}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPressed}" />
<DiscreteObjectKeyFrame KeyTime="0" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, TargetNullValue={ThemeResource ButtonForegroundPressed}}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="CopySuccessGlyph" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPressed}" />
<DiscreteObjectKeyFrame KeyTime="0" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, TargetNullValue={ThemeResource ButtonForegroundPressed}}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
<VisualState.Setters>
Expand Down Expand Up @@ -219,6 +194,31 @@
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<ContentPresenter
x:Name="ContentPresenter"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTransitions="{TemplateBinding ContentTransitions}"
FontFamily="{TemplateBinding FontFamily}"
FontSize="{TemplateBinding FontSize}"
Foreground="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, TargetNullValue={ThemeResource ButtonForeground}}"
RenderTransformOrigin=".5,.5">
<ContentPresenter.RenderTransform>
<ScaleTransform x:Name="CopyToClipboardTextScaleTransform" />
</ContentPresenter.RenderTransform>
</ContentPresenter>
<ContentPresenter
x:Name="CopySuccessGlyph"
Foreground="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, TargetNullValue={ThemeResource ButtonForeground}}"
Opacity="0"
RenderTransformOrigin=".5,.5">
<ContentPresenter.RenderTransform>
<ScaleTransform x:Name="CopyToClipboardSuccessTextScaleTransform" />
</ContentPresenter.RenderTransform>
<FontIcon FontSize="{TemplateBinding FontSize}" Glyph="&#xE73E;" />
</ContentPresenter>
</Grid>
</ControlTemplate>
</Setter.Value>
Expand Down