mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-22 22:23:29 -07:00
Merge pull request #23 from nventive/dev/madi/fix-button-themeing
Dev/madi/fix button themeing
This commit is contained in:
MaximeDionNventiveCom
GitHub
commit
6843d212c3
4 changed files with 1872 additions and 1859 deletions
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -26,28 +26,28 @@
|
|||
-->
|
||||
|
||||
<!-- CalculatorBaseStyle -->
|
||||
<Style x:Key="CalculatorBaseStyle"
|
||||
<Style x:Name="CalculatorBaseStyle"
|
||||
TargetType="local:Calculator">
|
||||
<Setter Property="Margin"
|
||||
Value="0,0,0,0"/>
|
||||
Value="0,0,0,0" />
|
||||
</Style>
|
||||
|
||||
<!-- UnitConverterBaseStyle -->
|
||||
<Style x:Key="UnitConverterBaseStyle"
|
||||
<Style x:Name="UnitConverterBaseStyle"
|
||||
TargetType="local:UnitConverter">
|
||||
<Setter Property="Visibility"
|
||||
Value="Collapsed"/>
|
||||
Value="Collapsed" />
|
||||
<Setter Property="IsEnabled"
|
||||
Value="False"/>
|
||||
Value="False" />
|
||||
<Setter Property="Margin"
|
||||
Value="0,0,0,0"/>
|
||||
Value="0,0,0,0" />
|
||||
</Style>
|
||||
|
||||
<!-- AboutFlyoutPresenterStyle -->
|
||||
<Style x:Key="AboutFlyoutPresenterStyle"
|
||||
TargetType="FlyoutPresenter">
|
||||
<Setter Property="IsTabStop"
|
||||
Value="False"/>
|
||||
Value="False" />
|
||||
<!--
|
||||
<Setter Property="AutomationProperties.AccessibilityView"
|
||||
Value="Raw"/>
|
||||
|
|
@ -58,20 +58,21 @@
|
|||
<Style x:Key="NavViewItemStyle"
|
||||
TargetType="NavigationViewItem">
|
||||
<Setter Property="KeyTipPlacementMode"
|
||||
Value="Right"/>
|
||||
Value="Right" />
|
||||
</Style>
|
||||
</Page.Resources>
|
||||
|
||||
<Grid toolkit:VisibleBoundsPadding.PaddingMask="All"
|
||||
android:Background="White">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto" />
|
||||
<!--
|
||||
This row is padding for the SystemFocusVisuals,
|
||||
otherwise the focus rectangles render under the title bar controls.
|
||||
-->
|
||||
<RowDefinition x:Name="FocusVisualMargin" Height="3"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition x:Name="FocusVisualMargin"
|
||||
Height="3" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
|
|
@ -79,25 +80,25 @@
|
|||
<VisualState x:Name="ConverterWide">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
|
||||
MinWindowWidth="640"/>
|
||||
MinWindowWidth="640" />
|
||||
</VisualState.StateTriggers>
|
||||
</VisualState>
|
||||
<VisualState x:Name="DockVisible">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
|
||||
MinWindowWidth="560"/>
|
||||
MinWindowWidth="560" />
|
||||
</VisualState.StateTriggers>
|
||||
</VisualState>
|
||||
<VisualState x:Name="MinSizeLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
|
||||
MinWindowWidth="{StaticResource AppMinWindowWidth}"/>
|
||||
MinWindowWidth="{StaticResource AppMinWindowWidth}" />
|
||||
</VisualState.StateTriggers>
|
||||
</VisualState>
|
||||
<VisualState x:Name="DefaultLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="0"
|
||||
MinWindowWidth="0"/>
|
||||
MinWindowWidth="0" />
|
||||
</VisualState.StateTriggers>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
|
|
@ -110,16 +111,16 @@
|
|||
-->
|
||||
<Button x:Name="copyButton"
|
||||
x:Uid="copyButton"
|
||||
Command="{x:Bind Model.CopyCommand}"/>
|
||||
Command="{x:Bind Model.CopyCommand}" />
|
||||
<Button x:Name="pasteButton"
|
||||
x:Uid="pasteButton"
|
||||
Command="{x:Bind Model.PasteCommand}"/>
|
||||
Command="{x:Bind Model.PasteCommand}" />
|
||||
<Button x:Name="copyButtonAlternate"
|
||||
x:Uid="copyButtonAlternate"
|
||||
Command="{x:Bind Model.CopyCommand}"/>
|
||||
Command="{x:Bind Model.CopyCommand}" />
|
||||
<Button x:Name="pasteButtonAlternate"
|
||||
x:Uid="pasteButtonAlternate"
|
||||
Command="{x:Bind Model.PasteCommand}"/>
|
||||
Command="{x:Bind Model.PasteCommand}" />
|
||||
</StackPanel>
|
||||
|
||||
<!-- Title Bar -->
|
||||
|
|
@ -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}"
|
||||
|
|
@ -165,7 +167,7 @@
|
|||
Style="{StaticResource NavViewItemStyle}">
|
||||
<NavigationViewItem.Icon>
|
||||
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
|
||||
Glyph=""/>
|
||||
Glyph="" />
|
||||
</NavigationViewItem.Icon>
|
||||
<TextBlock Text=""
|
||||
x:Name="AboutText" />
|
||||
|
|
@ -178,7 +180,7 @@
|
|||
Opened="OnAboutFlyoutOpened">
|
||||
|
||||
<local:AboutFlyout x:Name="AboutPage"
|
||||
x:Load="False"/>
|
||||
x:Load="False" />
|
||||
</Flyout>
|
||||
</NavigationViewItem.ContextFlyout>
|
||||
</NavigationViewItem>
|
||||
|
|
@ -195,7 +197,7 @@
|
|||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Style="{StaticResource SubtitleTextBlockStyle}"
|
||||
Text="{x:Bind Model.CategoryName, Mode=OneWay}"/>
|
||||
Text="{x:Bind Model.CategoryName, Mode=OneWay}" />
|
||||
|
||||
<Border x:Name="CalcHolder">
|
||||
<!-- PLACEHOLDER!!!! This is where the calculator goes when it is delay loaded -->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue