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

Issue 935 - Updates to Scientific/Graphing Keypad (#1214)

Browse Source 
* Switching from Difference between dates to Add or subtract dates ignores the first date field

https://github.com/microsoft/calculator/issues/254

Date field needs to persist across Date Difference and Add/Subtract From Date Mode.

* Update DateCalculator.xaml.cpp

Addressing review comments (white space, small code refactor), also found a null pointer exception during testing, this fix addresses that as well.

* Issue 935 - Updates to Scientific/Graphing Keypad

Update Scientific and Graphing keyboard layouts to expose square root button at the top level

* Updated ScientificModeFunctionalTests/SmokeTest_Cube()

Updated broken test to work with changes.
This commit is contained in:
Quentin
2020-05-08 12:32:17 -05:00
committed by GitHub
parent e9c96c939a
commit 7b4ff49df8
4 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Calculator/Views/CalculatorScientificOperators.xaml
View File

@@ -953,13 +953,13 @@
ButtonId="XPower2"
Content=""/>
<controls:CalculatorButton x:Name="XPower3Button"
x:Uid="xpower3Button"
<controls:CalculatorButton x:Name="SquareRootButton"
x:Uid="squareRootButton"
Grid.Row="1"
Style="{StaticResource SymbolOperatorButtonStyle}"
AutomationProperties.AutomationId="xpower3Button"
ButtonId="Cube"
Content="&#xf7cb;"/>
Style="{StaticResource EmphasizedCalcButtonStyle}"
AutomationProperties.AutomationId="squareRootButton"
ButtonId="Sqrt"
Content="&#xF899;"/>
<controls:CalculatorButton x:Name="PowerButton"
x:Uid="powerButton"
@@ -1004,13 +1004,13 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<controls:CalculatorButton x:Name="SquareRootButton"
x:Uid="squareRootButton"
Style="{StaticResource EmphasizedCalcButtonStyle}"
AutomationProperties.AutomationId="squareRootButton"
ButtonId="Sqrt"
<controls:CalculatorButton x:Name="XPower3Button"
x:Uid="xpower3Button"
Style="{StaticResource SymbolOperatorButtonStyle}"
AutomationProperties.AutomationId="xpower3Button"
ButtonId="Cube"
Click="ShiftButton_Uncheck"
Content="&#xF899;"/>
Content="&#xf7cb;"/>
<controls:CalculatorButton x:Name="CubeRootButton"
x:Uid="cubeRootButton"

25
src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
View File

@@ -998,14 +998,14 @@
Content="&#xf7c8;"
IsTabStop="false"/>
<controls:CalculatorButton x:Name="XPower3Button"
x:Uid="xpower3Button"
<controls:CalculatorButton x:Name="SquareRootButton"
x:Uid="squareRootButton"
Grid.Row="1"
Style="{StaticResource SymbolOperatorButtonStyle}"
AutomationProperties.AutomationId="xpower3Button"
ButtonId="Cube"
Style="{StaticResource EmphasizedCalcButtonStyle}"
AutomationProperties.AutomationId="squareRootButton"
ButtonId="Sqrt"
Click="Button_Clicked"
Content="&#xf7cb;"
Content="&#xF899;"
IsTabStop="false"/>
<controls:CalculatorButton x:Name="PowerButton"
@@ -1059,13 +1059,14 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<controls:CalculatorButton x:Name="SquareRootButton"
x:Uid="squareRootButton"
Style="{StaticResource EmphasizedCalcButtonStyle}"
AutomationProperties.AutomationId="squareRootButton"
ButtonId="Sqrt"
<controls:CalculatorButton x:Name="XPower3Button"
x:Uid="xpower3Button"
Style="{StaticResource SymbolOperatorButtonStyle}"
AutomationProperties.AutomationId="xpower3Button"
ButtonId="Cube"
Click="ShiftButton_Uncheck"
Content="&#xF899;"
Content="&#xf7cb;"
IsTabStop="false"/>
<controls:CalculatorButton x:Name="CubeRootButton"