DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui changes (#920)

Browse Source
This commit is contained in:
Pepe Rivera 2020-01-09 14:10:48 -08:00 committed by Eric Wong
parent 9b9c9fb7ee
commit c8a67eb574
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Calculator/App.xaml
View File

@ -69,16 +69,17 @@
<ApplicationTheme x:Key="CalcApplicationTheme">Dark</ApplicationTheme> <ApplicationTheme x:Key="CalcApplicationTheme">Dark</ApplicationTheme>
<SolidColorBrush x:Key="AppChromeAcrylicOperatorFlyoutBackgroundBrush" Color="#FF2F2F2F"/> <SolidColorBrush x:Key="AppChromeAcrylicOperatorFlyoutBackgroundBrush" Color="#FF2F2F2F"/>
<SolidColorBrush x:Key="AppControlTransparentButtonBackgroundBrush" Color="Transparent"/> <SolidColorBrush x:Key="AppControlTransparentButtonBackgroundBrush" Color="Transparent"/>
<SolidColorBrush x:Key="EquationBrush1" Color="#FFE81123"/>
<SolidColorBrush x:Key="EquationBrush2" Color="#FFE3008C"/> <SolidColorBrush x:Key="EquationBrush1" Color="#FF0063B1"/>
<SolidColorBrush x:Key="EquationBrush3" Color="#FFB31564"/> <SolidColorBrush x:Key="EquationBrush2" Color="#FF00B7C3"/>
<SolidColorBrush x:Key="EquationBrush3" Color="#FF6600CC"/>
<SolidColorBrush x:Key="EquationBrush4" Color="#FF107C10"/> <SolidColorBrush x:Key="EquationBrush4" Color="#FF107C10"/>
<SolidColorBrush x:Key="EquationBrush5" Color="#FF00CC6A"/> <SolidColorBrush x:Key="EquationBrush5" Color="#FF00CC6A"/>
<SolidColorBrush x:Key="EquationBrush6" Color="#FF008055"/> <SolidColorBrush x:Key="EquationBrush6" Color="#FF008055"/>
<SolidColorBrush x:Key="EquationBrush7" Color="#FF58595B"/> <SolidColorBrush x:Key="EquationBrush7" Color="#FF58595B"/>
<SolidColorBrush x:Key="EquationBrush8" Color="#FF0063B1"/> <SolidColorBrush x:Key="EquationBrush8" Color="#FFE81123"/>
<SolidColorBrush x:Key="EquationBrush9" Color="#FF00B7C3"/> <SolidColorBrush x:Key="EquationBrush9" Color="#FFE3008C"/>
<SolidColorBrush x:Key="EquationBrush10" Color="#FF6600CC"/> <SolidColorBrush x:Key="EquationBrush10" Color="#FFB31564"/>
<SolidColorBrush x:Key="EquationBrush11" Color="#FFFFB900"/> <SolidColorBrush x:Key="EquationBrush11" Color="#FFFFB900"/>
<SolidColorBrush x:Key="EquationBrush12" Color="#FFF7630C"/> <SolidColorBrush x:Key="EquationBrush12" Color="#FFF7630C"/>
<SolidColorBrush x:Key="EquationBrush13" Color="#FF8E562E"/> <SolidColorBrush x:Key="EquationBrush13" Color="#FF8E562E"/>
@ -147,16 +148,17 @@
TintOpacity="0.8"/> TintOpacity="0.8"/>
<ApplicationTheme x:Key="CalcApplicationTheme">Light</ApplicationTheme> <ApplicationTheme x:Key="CalcApplicationTheme">Light</ApplicationTheme>
<SolidColorBrush x:Key="AppControlTransparentButtonBackgroundBrush" Color="Transparent"/> <SolidColorBrush x:Key="AppControlTransparentButtonBackgroundBrush" Color="Transparent"/>
<SolidColorBrush x:Key="EquationBrush1" Color="#FFE81123"/>
<SolidColorBrush x:Key="EquationBrush2" Color="#FFE3008C"/> <SolidColorBrush x:Key="EquationBrush1" Color="#FF0063B1"/>
<SolidColorBrush x:Key="EquationBrush3" Color="#FFB31564"/> <SolidColorBrush x:Key="EquationBrush2" Color="#FF00B7C3"/>
<SolidColorBrush x:Key="EquationBrush3" Color="#FF6600CC"/>
<SolidColorBrush x:Key="EquationBrush4" Color="#FF107C10"/> <SolidColorBrush x:Key="EquationBrush4" Color="#FF107C10"/>
<SolidColorBrush x:Key="EquationBrush5" Color="#FF00CC6A"/> <SolidColorBrush x:Key="EquationBrush5" Color="#FF00CC6A"/>
<SolidColorBrush x:Key="EquationBrush6" Color="#FF008055"/> <SolidColorBrush x:Key="EquationBrush6" Color="#FF008055"/>
<SolidColorBrush x:Key="EquationBrush7" Color="#FF58595B"/> <SolidColorBrush x:Key="EquationBrush7" Color="#FF58595B"/>
<SolidColorBrush x:Key="EquationBrush8" Color="#FF0063B1"/> <SolidColorBrush x:Key="EquationBrush8" Color="#FFE81123"/>
<SolidColorBrush x:Key="EquationBrush9" Color="#FF00B7C3"/> <SolidColorBrush x:Key="EquationBrush9" Color="#FFE3008C"/>
<SolidColorBrush x:Key="EquationBrush10" Color="#FF6600CC"/> <SolidColorBrush x:Key="EquationBrush10" Color="#FFB31564"/>
<SolidColorBrush x:Key="EquationBrush11" Color="#FFFFB900"/> <SolidColorBrush x:Key="EquationBrush11" Color="#FFFFB900"/>
<SolidColorBrush x:Key="EquationBrush12" Color="#FFF7630C"/> <SolidColorBrush x:Key="EquationBrush12" Color="#FFF7630C"/>
<SolidColorBrush x:Key="EquationBrush13" Color="#FF8E562E"/> <SolidColorBrush x:Key="EquationBrush13" Color="#FF8E562E"/>

2
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View File

@ -763,7 +763,7 @@
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<mux:ItemsRepeaterScrollHost> <mux:ItemsRepeaterScrollHost>
<ScrollViewer> <ScrollViewer VerticalScrollBarVisibility="Auto">
<StackPanel> <StackPanel>
<mux:ItemsRepeater x:Name="EquationInputList" <mux:ItemsRepeater x:Name="EquationInputList"
ItemsSource="{x:Bind Equations}" ItemsSource="{x:Bind Equations}"

3
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
View File

@ -567,6 +567,9 @@
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="14" FontSize="14"
Glyph="&#xE895;"/> Glyph="&#xE895;"/>
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Number0" Modifiers="Control"/>
</Button.KeyboardAccelerators>
</Button> </Button>
</StackPanel> </StackPanel>
</Border> </Border>