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

Merge pull request #66 from nventive/dev/madi/fix-combobox-drop-down-gliph

Browse source 
Fix dropdown gliph on ios and android
This commit is contained in:
MaximeDionNventiveCom 2019-05-27 13:37:36 -04:00 • committed by GitHub
commit 622a4a22c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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}" />
<Setter Target="SelectedContentPresenter.Foreground"
Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
<Setter Target="DropDownGlyph.Foreground"
<Setter Target="DropDownGlyph.Fill"
Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
</VisualState.Setters>
</VisualState>
@ -97,7 +97,7 @@
Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
<Setter Target="SelectedContentPresenter.Foreground"
Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
<Setter Target="DropDownGlyph.Foreground"
<Setter Target="DropDownGlyph.Fill"
Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
</VisualState.Setters>
</VisualState>

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

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