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

Merge pull request #67 from nventive/dev/nich/prog-bugs

Browse source 
Fixed android margins, and prog numpad not displaying
This commit is contained in:
NicolasChampagne 2019-05-27 13:10:27 -04:00 • committed by GitHub
commit ec26223eaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
View file

@ -268,7 +268,9 @@ namespace CalculatorApp.ViewModel
} }
} }
public bool IsBinaryBitFlippingEnabled public bool IsBitFlipCheckedOppositeValue => !IsBitFlipChecked;
public bool IsBinaryBitFlippingEnabled
{ {
get get
{ {

3
src/Calculator.Shared/Views/CalculatorProgrammerDisplayPanel.xaml
View file

@ -75,7 +75,8 @@
Style="{StaticResource ProgKeypadRadioButtonStyle}" Style="{StaticResource ProgKeypadRadioButtonStyle}"
AutomationProperties.AutomationId="fullKeypad" AutomationProperties.AutomationId="fullKeypad"
Content="" Content=""
IsChecked="{x:Bind Model.IsBitFlipChecked, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}" /> Visibility="Visible"
IsChecked="{x:Bind Model.IsBitFlipCheckedOppositeValue}" />
<RadioButton x:Name="bitFlip" <RadioButton x:Name="bitFlip"
x:Uid="bitFlip" x:Uid="bitFlip"

10
src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
View file

@ -5,9 +5,11 @@
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
xmlns:designdata="using:CalculatorApp.DesignData" xmlns:designdata="using:CalculatorApp.DesignData"
xmlns:local="using:CalculatorApp.Views" xmlns:local="using:CalculatorApp.Views"
xmlns:android="http://nventive.com/android"
xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="ControlRoot" x:Name="ControlRoot"
mc:Ignorable=""> mc:Ignorable="android">
<UserControl.Resources> <UserControl.Resources>
<!-- Programmer mode display radio button --> <!-- Programmer mode display radio button -->
@ -112,7 +114,8 @@
<TextBlock x:Name="ContentPresenter" <TextBlock x:Name="ContentPresenter"
Grid.Column="2" Grid.Column="2"
Margin="0,2,4,-2" not_android:Margin="0,2,4,-2"
android:Margin="4,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}" Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
@ -158,7 +161,8 @@
<TextBlock x:Name="CheckedContentPresenter" <TextBlock x:Name="CheckedContentPresenter"
Grid.Column="2" Grid.Column="2"
Margin="0,2,4,-2" not_android:Margin="0,2,4,-2"
android:Margin="4,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}" Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"