github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-24 15:05:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed unused duplicate zeros in Margin and Paddings

Browse source
This commit is contained in:
Moien Tajik 2019-03-07 13:28:39 +03:30
commit 0564825afc
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Calculator/App.xaml
View file

@ -13,7 +13,7 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default"> <ResourceDictionary x:Key="Default">
<Thickness x:Key="HighContrastThicknessTop">0,0,0,0</Thickness> <Thickness x:Key="HighContrastThicknessTop">0</Thickness>
<x:Double x:Key="HighContrastStrokeThickness">0</x:Double> <x:Double x:Key="HighContrastStrokeThickness">0</x:Double>
<Color x:Key="AltHighColor">#FF000000</Color> <Color x:Key="AltHighColor">#FF000000</Color>
<Color x:Key="ChromeMediumLowColor">#FF2B2B2B</Color> <Color x:Key="ChromeMediumLowColor">#FF2B2B2B</Color>
@ -45,7 +45,7 @@
TintOpacity="0.7"/> TintOpacity="0.7"/>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="Light"> <ResourceDictionary x:Key="Light">
<Thickness x:Key="HighContrastThicknessTop">0,0,0,0</Thickness> <Thickness x:Key="HighContrastThicknessTop">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="AltHighColor">#FFF2F2F2</Color>
<Color x:Key="ChromeMediumLowColor">#FFE0E0E0</Color> <Color x:Key="ChromeMediumLowColor">#FFE0E0E0</Color>
@ -381,7 +381,7 @@
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ScrollViewer x:Name="textContainer" <ScrollViewer x:Name="textContainer"
Grid.Column="1" Grid.Column="1"
Padding="0,0,0,0" Padding="0"
Style="{ThemeResource ResultsScrollerSnapped}" Style="{ThemeResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<TextBlock x:Name="normalOutput" <TextBlock x:Name="normalOutput"
@ -467,7 +467,7 @@
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ScrollViewer x:Name="textContainer" <ScrollViewer x:Name="textContainer"
Grid.Column="1" Grid.Column="1"
Padding="0,0,0,0" Padding="0"
Style="{ThemeResource ResultsScrollerSnapped}" Style="{ThemeResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<TextBlock x:Name="normalOutput" <TextBlock x:Name="normalOutput"
@ -554,7 +554,7 @@
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ScrollViewer x:Name="textContainer" <ScrollViewer x:Name="textContainer"
Grid.Column="1" Grid.Column="1"
Padding="0,0,0,0" Padding="0"
Style="{ThemeResource ResultsScrollerSnapped}" Style="{ThemeResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<TextBlock x:Name="normalOutput" <TextBlock x:Name="normalOutput"
@ -1222,7 +1222,7 @@
Opacity="0" Opacity="0"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<Grid x:Name="ContentPresenterGrid" <Grid x:Name="ContentPresenterGrid"
Margin="0,0,0,0" Margin="0"
Background="Transparent"> Background="Transparent">
<Grid.RenderTransform> <Grid.RenderTransform>
<TranslateTransform x:Name="ContentPresenterTranslateTransform"/> <TranslateTransform x:Name="ContentPresenterTranslateTransform"/>

12
src/Calculator/Views/Calculator.xaml
View file

@ -150,7 +150,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ScrollViewer x:Name="expressionContainer" <ScrollViewer x:Name="expressionContainer"
Grid.Column="1" Grid.Column="1"
Padding="0,0,0,0" Padding="0"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Style="{StaticResource ResultsScrollerSnapped}" Style="{StaticResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
@ -265,7 +265,7 @@
<Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeL}"/> <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeL}"/>
<Setter Property="MinFontSize" Value="12"/> <Setter Property="MinFontSize" Value="12"/>
<Setter Property="IsActive" Value="True"/> <Setter Property="IsActive" Value="True"/>
<Setter Property="DisplayMargin" Value="0,0,0,0"/> <Setter Property="DisplayMargin" Value="0"/>
<Setter Property="MaxExpressionHistoryCharacters" Value="51"/> <Setter Property="MaxExpressionHistoryCharacters" Value="51"/>
</Style> </Style>
@ -278,7 +278,7 @@
<Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeM}"/> <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeM}"/>
<Setter Property="MinFontSize" Value="12"/> <Setter Property="MinFontSize" Value="12"/>
<Setter Property="IsActive" Value="True"/> <Setter Property="IsActive" Value="True"/>
<Setter Property="DisplayMargin" Value="0,0,0,0"/> <Setter Property="DisplayMargin" Value="0"/>
<Setter Property="MaxExpressionHistoryCharacters" Value="30"/> <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
</Style> </Style>
@ -291,7 +291,7 @@
<Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeS}"/> <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeS}"/>
<Setter Property="MinFontSize" Value="12"/> <Setter Property="MinFontSize" Value="12"/>
<Setter Property="IsActive" Value="True"/> <Setter Property="IsActive" Value="True"/>
<Setter Property="DisplayMargin" Value="0,0,0,0"/> <Setter Property="DisplayMargin" Value="0"/>
<Setter Property="MaxExpressionHistoryCharacters" Value="30"/> <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
</Style> </Style>
@ -299,7 +299,7 @@
<Style x:Key="ScrollButtonStyle" TargetType="Button"> <Style x:Key="ScrollButtonStyle" TargetType="Button">
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
<Setter Property="Padding" Value="0,0,0,0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
@ -628,7 +628,7 @@
<controls:CalculationResult x:Name="Results" <controls:CalculationResult x:Name="Results"
x:Uid="CalculatorResults" x:Uid="CalculatorResults"
Grid.Row="2" Grid.Row="2"
Margin="0,0,0,0" Margin="0"
Style="{ThemeResource ResultsStyleM}" Style="{ThemeResource ResultsStyleM}"
AutomationProperties.AutomationId="CalculatorResults" AutomationProperties.AutomationId="CalculatorResults"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"

2
src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml
View file

@ -23,7 +23,7 @@
<Setter Property="FontSize" Value="20"/> <Setter Property="FontSize" Value="20"/>
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/> <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/> <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
<Setter Property="Padding" Value="0,0,0,0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="MinWidth" Value="12"/> <Setter Property="MinWidth" Value="12"/>
<Setter Property="MinHeight" Value="20"/> <Setter Property="MinHeight" Value="20"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/> <Setter Property="HorizontalAlignment" Value="Stretch"/>

10
src/Calculator/Views/DateCalculator.xaml
View file

@ -21,7 +21,7 @@
</DataTemplate> </DataTemplate>
<Style x:Key="DateCalculation_ComboStyle" TargetType="ComboBox"> <Style x:Key="DateCalculation_ComboStyle" TargetType="ComboBox">
<Setter Property="Padding" Value="0,0,0,0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="MinHeight" Value="20"/> <Setter Property="MinHeight" Value="20"/>
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/> <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/> <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
@ -242,7 +242,7 @@
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ContentPresenter Grid.Row="1" <ContentPresenter Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Margin="0,0,0,0" Margin="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"
@ -440,7 +440,7 @@
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<CalendarDatePicker x:Name="DateDiff_ToDate" <CalendarDatePicker x:Name="DateDiff_ToDate"
Grid.Row="5" Grid.Row="5"
Margin="0,0,0,0" Margin="0"
Style="{StaticResource DateCalculation_CalendarPickerStyle}" Style="{StaticResource DateCalculation_CalendarPickerStyle}"
AutomationProperties.LabeledBy="{x:Bind Date_ToLabel}" AutomationProperties.LabeledBy="{x:Bind Date_ToLabel}"
CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}" CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"
@ -450,7 +450,7 @@
<!-- Difference Result --> <!-- Difference Result -->
<TextBlock x:Uid="Date_DifferenceLabel" <TextBlock x:Uid="Date_DifferenceLabel"
Grid.Row="7" Grid.Row="7"
Margin="0,0,0,0" Margin="0"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"/> Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
<TextBlock x:Name="DateDiffAllUnitsResultLabel" <TextBlock x:Name="DateDiffAllUnitsResultLabel"
Grid.Row="8" Grid.Row="8"
@ -498,7 +498,7 @@
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<CalendarDatePicker x:Name="AddSubtract_FromDate" <CalendarDatePicker x:Name="AddSubtract_FromDate"
Grid.Row="2" Grid.Row="2"
Margin="0,0,0,0" Margin="0"
Style="{StaticResource DateCalculation_CalendarPickerStyle}" Style="{StaticResource DateCalculation_CalendarPickerStyle}"
AutomationProperties.LabeledBy="{x:Bind AddSubtract_Date_FromLabel}" AutomationProperties.LabeledBy="{x:Bind AddSubtract_Date_FromLabel}"
CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}" CalendarViewStyle="{StaticResource DateCalculation_CalendarViewStyle}"

4
src/Calculator/Views/MainPage.xaml
View file

@ -19,12 +19,12 @@
<Page.Resources> <Page.Resources>
<automation:NarratorNotifier x:Name="NarratorNotifier"/> <automation:NarratorNotifier x:Name="NarratorNotifier"/>
<Style x:Name="CalculatorBaseStyle" TargetType="local:Calculator"> <Style x:Name="CalculatorBaseStyle" TargetType="local:Calculator">
<Setter Property="Margin" Value="0,0,0,0"/> <Setter Property="Margin" Value="0"/>
</Style> </Style>
<Style x:Name="UnitConverterBaseStyle" TargetType="local:UnitConverter"> <Style x:Name="UnitConverterBaseStyle" TargetType="local:UnitConverter">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
<Setter Property="IsEnabled" Value="False"/> <Setter Property="IsEnabled" Value="False"/>
<Setter Property="Margin" Value="0,0,0,0"/> <Setter Property="Margin" Value="0"/>
</Style> </Style>
<Style x:Key="AboutFlyoutPresenterStyle" TargetType="FlyoutPresenter"> <Style x:Key="AboutFlyoutPresenterStyle" TargetType="FlyoutPresenter">
<Setter Property="IsTabStop" Value="False"/> <Setter Property="IsTabStop" Value="False"/>

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

@ -203,7 +203,7 @@
<Setter Property="FontWeight" Value="Light"/> <Setter Property="FontWeight" Value="Light"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/> <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Bottom"/> <Setter Property="VerticalContentAlignment" Value="Bottom"/>
<Setter Property="Margin" Value="0,0,0,0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="DisplayMargin" Value="0,0,0,4"/> <Setter Property="DisplayMargin" Value="0,0,0,4"/>
</Style> </Style>
<Style x:Key="ValueSmallStyle" <Style x:Key="ValueSmallStyle"
@ -216,7 +216,7 @@
<Setter Property="FontWeight" Value="Light"/> <Setter Property="FontWeight" Value="Light"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/> <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Bottom"/> <Setter Property="VerticalContentAlignment" Value="Bottom"/>
<Setter Property="Margin" Value="0,0,0,0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="DisplayMargin" Value="0,0,0,4"/> <Setter Property="DisplayMargin" Value="0,0,0,4"/>
</Style> </Style>