github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dropdown gliph on ios and android

Browse source
This commit is contained in:
Maxime Dion 2019-05-27 11:22:28 -04:00
commit 2f9ce2660b
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator.Shared/Views/DateCalculator.xaml
View file

@ -87,7 +87,7 @@
Value="{ThemeResource SystemControlHighlightTransparentBrush}" /> Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
<Setter Target="SelectedContentPresenter.Foreground" <Setter Target="SelectedContentPresenter.Foreground"
Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" /> Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
<Setter Target="DropDownGlyph.Foreground" <Setter Target="DropDownGlyph.Fill"
Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" /> Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
@ -97,7 +97,7 @@
Value="{ThemeResource SystemControlHighlightTransparentBrush}" /> Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
<Setter Target="SelectedContentPresenter.Foreground" <Setter Target="SelectedContentPresenter.Foreground"
Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" /> Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
<Setter Target="DropDownGlyph.Foreground" <Setter Target="DropDownGlyph.Fill"
Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" /> Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>

20
src/Calculator.Shared/Views/UnitConverter.xaml
View file

@ -79,14 +79,14 @@
<VisualState.Setters> <VisualState.Setters>
<Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/> <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
<Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/> <Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/>
<Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/> <Setter Target="DropDownGlyph.Fill" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Pressed"> <VisualState x:Name="Pressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/> <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
<Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/> <Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/>
<Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/> <Setter Target="DropDownGlyph.Fill" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Disabled"/> <VisualState x:Name="Disabled"/>
@ -136,16 +136,16 @@
ContentTemplate="{StaticResource SelectedUnitTemplate}" ContentTemplate="{StaticResource SelectedUnitTemplate}"
FlowDirection="{TemplateBinding FlowDirection}"/> FlowDirection="{TemplateBinding FlowDirection}"/>
<!--TODO UNO: AutomationProperties.AccessibilityView="Raw"--> <!--TODO UNO: AutomationProperties.AccessibilityView="Raw"-->
<TextBlock x:Name="DropDownGlyph" <Path x:Name="DropDownGlyph"
Grid.Column="1" Data="M30.519004,0L32.000998,1.3439932 15.932995,19.049 0,1.4920032 1.481019,0.1489867 15.932995,16.071982z"
Margin="8,3,12,0" Fill="{ThemeResource SystemControlForegroundBaseHighBrush}"
Stretch="Uniform"
Width="12"
IsHitTestVisible="False"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}" Margin="8,3,12,0"
FontFamily="{ThemeResource SymbolThemeFontFamily}" Grid.Column="1"/>
FontSize="12"
IsHitTestVisible="False"
Text="&#xE0E5;"/>
<!--TODO UNO: AutomationProperties.AccessibilityView="Raw"--> <!--TODO UNO: AutomationProperties.AccessibilityView="Raw"-->
<Popup x:Name="Popup"> <Popup x:Name="Popup">
<Border x:Name="PopupBorder" <Border x:Name="PopupBorder"