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

reformatting

Browse source
This commit is contained in:
Rudy Huyn 2019-04-03 21:44:20 -07:00
commit db7f3c587e
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Calculator/Views/Calculator.xaml.cpp
View file

@ -42,10 +42,10 @@ DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsScientific);
DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsProgrammer); DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsProgrammer);
Calculator::Calculator() : Calculator::Calculator() :
m_doAnimate(false), m_doAnimate(false),
m_isLastAnimatedInScientific(false), m_isLastAnimatedInScientific(false),
m_isLastAnimatedInProgrammer(false), m_isLastAnimatedInProgrammer(false),
m_resultAnimate(false) m_resultAnimate(false)
{ {
SetFontSizeResources(); SetFontSizeResources();
InitializeComponent(); InitializeComponent();
@ -192,7 +192,7 @@ void Calculator::UpdateViewState()
state = L"Scientific"; state = L"Scientific";
Model->IsDecimalEnabled = true; Model->IsDecimalEnabled = true;
ResultsMVisualStateTrigger->MinWindowHeight = 544; ResultsMVisualStateTrigger->MinWindowHeight = 544;
} }
else else
{ {
state = L"Standard"; state = L"Standard";
@ -633,7 +633,6 @@ void Calculator::EnableMemoryControls(bool enable)
void Calculator::EnableControls(bool enable) void Calculator::EnableControls(bool enable)
{ {
OpsPanel->IsEnabled = enable; OpsPanel->IsEnabled = enable;
EnableMemoryControls(enable); EnableMemoryControls(enable);
} }

3
src/Calculator/Views/UnitConverter.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="CalculatorApp.UnitConverter" <UserControl x:Class="CalculatorApp.UnitConverter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="using:CalculatorApp.Common.Automation" xmlns:automation="using:CalculatorApp.Common.Automation"
@ -204,7 +204,6 @@
<Setter Property="Margin" Value="0,0,0,0"/> <Setter Property="Margin" Value="0,0,0,0"/>
<Setter Property="DisplayMargin" Value="0,0,0,4"/> <Setter Property="DisplayMargin" Value="0,0,0,4"/>
</Style> </Style>
<Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock"> <Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock">
<Setter Property="FontWeight" Value="Light"/> <Setter Property="FontWeight" Value="Light"/>
<Setter Property="HorizontalAlignment" Value="Left"/> <Setter Property="HorizontalAlignment" Value="Left"/>