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

Merge pull request #77 from nventive/dev/madi/fix-landscape-mode-ios-2

Browse source 
154672 [Calculator] Landscape mode is broken
This commit is contained in:
MaximeDionNventiveCom 2019-05-27 21:18:22 -04:00 • committed by GitHub
commit 21c229429d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Calculator.Shared/Styles.xaml
View file

@ -307,7 +307,8 @@
<x:Double x:Key="CalcButtonCaptionSize">34</x:Double> <x:Double x:Key="CalcButtonCaptionSize">34</x:Double>
<x:Double x:Key="CalcStandardOperatorCaptionSizeLarge">24</x:Double> <x:Double x:Key="CalcStandardOperatorCaptionSizeLarge">24</x:Double>
<!-- Numpad Standard/Scientific in Fill/Full --> <!-- Numpad Standard/Scientific in Fill/Full -->
<x:Double x:Key="CalcStandardOperatorCaptionSize">20</x:Double> <!-- UNO TODO Temp fix, value should be 20 -->
<x:Double x:Key="CalcStandardOperatorCaptionSize">17</x:Double>
<!-- Standard Operators Standard/Scientific in Fill/Full --> <!-- Standard Operators Standard/Scientific in Fill/Full -->
<x:Double x:Key="CalcOperatorCaptionSize">15</x:Double> <x:Double x:Key="CalcOperatorCaptionSize">15</x:Double>

2
src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
View file

@ -124,7 +124,7 @@
Value="{StaticResource TitleFontSize}" /> Value="{StaticResource TitleFontSize}" />
<Setter Target="NumberPad.ButtonStyle" <Setter Target="NumberPad.ButtonStyle"
Value="{StaticResource NumericButtonStyle24}" /> Value="{StaticResource NumericButtonStyle18}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>

20
src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
View file

@ -256,11 +256,23 @@
<Setter Target="equalButton.FontSize" <Setter Target="equalButton.FontSize"
Value="{ThemeResource CalcStandardOperatorCaptionSize}" /> Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
<Setter Target="NumberPad.ButtonStyle" <Setter Target="NumberPad.ButtonStyle"
Value="{ThemeResource NumericButtonStyle34}" /> Value="{ThemeResource NumericButtonStyle12}" />
</VisualState.Setters> </VisualState.Setters>
<Storyboard Completed="WideLayout_Completed" /> <Storyboard Completed="WideLayout_Completed" />
</VisualState> </VisualState>
<!-- UNO TODO Temp fix for iphoneX-->
<VisualState x:Name="Landscape">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowHeight="768"
MinWindowWidth="1366" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="NumberPad.ButtonStyle"
Value="{ThemeResource NumericButtonStyle12}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="WideL"> <VisualState x:Name="WideL">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowHeight="768" <AdaptiveTrigger MinWindowHeight="768"
@ -1027,6 +1039,9 @@
ButtonId="CloseParenthesis" ButtonId="CloseParenthesis"
Content=")" /> Content=")" />
<!-- UNO TODO Temp fix for iphone7 Landscape mode
ButtonStyle should be "{StaticResource NumericButtonStyle24}"
-->
<local:NumberPad x:Name="NumberPad" <local:NumberPad x:Name="NumberPad"
x:Uid="NumberPad" x:Uid="NumberPad"
Grid.Row="5" Grid.Row="5"
@ -1034,7 +1049,6 @@
Grid.Column="6" Grid.Column="6"
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
ButtonStyle="{StaticResource NumericButtonStyle24}" ButtonStyle="{StaticResource NumericButtonStyle18}" />
DecimalButtonStyle="{StaticResource DecimalButtonStyle}" />
</Grid> </Grid>
</UserControl> </UserControl>