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 #23 from nventive/dev/madi/fix-button-themeing

Browse source 
Dev/madi/fix button themeing
This commit is contained in:
MaximeDionNventiveCom 2019-05-26 08:18:58 -04:00 • committed by GitHub
commit 6843d212c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1872 additions and 1859 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/Calculator.Shared/Styles.xaml
View file

@ -182,17 +182,29 @@
</ResourceDictionary.ThemeDictionaries>-->
<!-- UNO TODO BEGIN THEME RESOURCES -->
<Thickness x:Key="HighContrastThicknessTop">
0,0,0,0
</Thickness>
<Thickness x:Key="HighContrastThicknessTop">0,0,0,0</Thickness>
<x:Double x:Key="HighContrastStrokeThickness">
0
</x:Double>
<x:Double x:Key="HighContrastStrokeThickness">0</x:Double>
<Color x:Key="AltHighColor">#FFF2F2F2</Color>
<Color x:Key="ChromeMediumLowColor">#FFE0E0E0</Color>
<Color x:Key="AccentPressColor">#FFB0DCFF</Color>
<Color x:Key="AccentHoverColor">#FF0077D7</Color>
<SolidColorBrush x:Key="AccentPressBackgroundColorBrush"
Color="{StaticResource AccentPressColor}" />
<SolidColorBrush x:Key="AccentHoverBackgroundColorBrush"
Color="{StaticResource AccentHoverColor}" />
<SolidColorBrush x:Key="AccentPressForegroundColorBrush"
Color="White" />
<SolidColorBrush x:Key="AccentHoverForegroundColorBrush"
Color="White" />
<SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush"
Color="{StaticResource AltHighColor}" />
@ -249,8 +261,7 @@
<win:RevealBackgroundBrush x:Key="AppControlHighlightAltListAccentHighRevealBackgroundBrush"
TargetTheme="Dark"
Color="{ThemeResource SystemAccentColorDark3}"
FallbackColor="{ThemeResource SystemAccentColorDark3}"
/>
FallbackColor="{ThemeResource SystemAccentColorDark3}" />
<xamarin:SolidColorBrush x:Key="AppControlHighlightAltListAccentHighRevealBackgroundBrush"
Color="{ThemeResource SystemColorHighlightTextColor}" />
@ -316,11 +327,11 @@
<Setter Property="Foreground"
Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
<Setter Property="HoverBackground"
Value="{ThemeResource AppControlHoverButtonFaceBrush}" />
Value="{StaticResource AppControlHoverButtonFaceBrush}" />
<Setter Property="HoverForeground"
Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
<Setter Property="PressBackground"
Value="{ThemeResource AppControlPressedButtonFaceBrush}" />
Value="{StaticResource AppControlPressedButtonFaceBrush}" />
<Setter Property="PressForeground"
Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
<Setter Property="BorderThickness"
@ -563,16 +574,16 @@
<Style x:Key="AccentCalcButtonStyle"
BasedOn="{StaticResource SymbolOperatorButtonStyle}"
TargetType="Controls:CalculatorButton">
<!--
UNO TODO
<Setter Property="HoverBackground"
Value="{ThemeResource SystemControlHighlightAccentRevealBackgroundBrush}" />
Value="{StaticResource AccentHoverBackgroundColorBrush}" />
<Setter Property="HoverForeground"
Value="{ThemeResource SystemControlHighlightAltAltHighBrush}" />-->
Value="{ThemeResource AccentHoverForegroundColorBrush}" />
<Setter Property="PressBackground"
Value="{ThemeResource AppControlHighlightAltListAccentHighRevealBackgroundBrush}" />
Value="{StaticResource AccentPressBackgroundColorBrush}" />
<Setter Property="PressForeground"
Value="{ThemeResource SystemControlHighlightAltAltHighBrush}" />
Value="{ThemeResource AccentHoverForegroundColorBrush}" />
</Style>
<!-- RESULTS -->

10
src/Calculator.Shared/Views/MainPage.xaml
View file

@ -26,14 +26,14 @@
-->
<!-- CalculatorBaseStyle -->
<Style x:Key="CalculatorBaseStyle"
<Style x:Name="CalculatorBaseStyle"
TargetType="local:Calculator">
<Setter Property="Margin"
Value="0,0,0,0" />
</Style>
<!-- UnitConverterBaseStyle -->
<Style x:Key="UnitConverterBaseStyle"
<Style x:Name="UnitConverterBaseStyle"
TargetType="local:UnitConverter">
<Setter Property="Visibility"
Value="Collapsed" />
@ -70,7 +70,8 @@
This row is padding for the SystemFocusVisuals,
otherwise the focus rectangles render under the title bar controls.
-->
<RowDefinition x:Name="FocusVisualMargin" Height="3"/>
<RowDefinition x:Name="FocusVisualMargin"
Height="3" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
@ -150,7 +151,8 @@
<NavigationView.PaneFooter>
<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
<StackPanel HorizontalAlignment="Stretch"
Orientation="Vertical">
<NavigationViewList x:Name="NavFooter"
Width="{x:Bind NavView.OpenPaneLength, Mode=Oneway}"