Skip to content

Commit 5f17057

Browse files
committed
Remove extra changes I inlcuded for the layout change
1 parent 26c31a9 commit 5f17057

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Samples/Islands/WpfCalculator/CalculatorDemo/CalculatorDemo.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
<DependentUpon>MainWindow.xaml</DependentUpon>
102102
<SubType>Code</SubType>
103103
</Compile>
104-
<Compile Include="MainWindow_Demo3.cs" />
105104
</ItemGroup>
106105
<ItemGroup>
107106
<Compile Include="MyTextBox.cs" />

Samples/Islands/WpfCalculator/CalculatorDemo/MainWindow.xaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
xmlns:local="clr-namespace:CalculatorDemo"
77
mc:Ignorable="d"
88
Title="MainWindow"
9-
Height="350"
10-
Width="525"
9+
Height="450"
10+
Width="650"
1111
Icon="appicon.ico">
1212

1313
<Window.Resources>
@@ -60,7 +60,7 @@
6060
<ColumnDefinition />
6161
</Grid.ColumnDefinitions>
6262
<Grid.RowDefinitions>
63-
<RowDefinition Height="30" />
63+
<RowDefinition />
6464
<RowDefinition />
6565
<RowDefinition />
6666
<RowDefinition />
@@ -121,9 +121,9 @@
121121
ToolTip="Add To Memory">
122122
M+
123123
</Button>
124-
<TextBlock Name="BMemBox" Grid.Column="3" Grid.Row="1" Margin="10,10,10,10" Grid.ColumnSpan="4">Memory: [empty]</TextBlock>
124+
<TextBlock Name="BMemBox" Grid.Column="3" Grid.Row="1" Margin="10,17,10,17" Grid.ColumnSpan="2">Memory: [empty]</TextBlock>
125125

126-
<local:MyTextBox Grid.ColumnSpan="9" x:Name="DisplayBox" Margin="5,0,5,0" FontSize="16" BorderBrush="LightGray"/>
126+
<local:MyTextBox Grid.ColumnSpan="9" x:Name="DisplayBox" Height="30" Margin="5" FontSize="20" BorderBrush="LightGray"/>
127127
<Border x:Name="DisplayAreaBorder" Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="5">
128128
<local:MyTextBox x:Name="PaperBox" BorderBrush="LightGray"/>
129129
</Border>
@@ -133,7 +133,7 @@
133133

134134
<!-- This is what's shown when we enter the compat view mode-->
135135
<!-- Demo3_Step2_AddCompact -->
136-
136+
<!--
137137
<DockPanel Name="CompactPanel" Visibility="Collapsed" >
138138
<DockPanel DockPanel.Dock="Top">
139139
<Button Name="ExitCompactViewButton" Click="ExitCompactViewButton_Click" DockPanel.Dock="Right">Restore</Button>
@@ -170,6 +170,6 @@
170170
Foreground="{DynamicResource AccentButtonForeground}" Background="{DynamicResource AccentButtonBackground}">=</Button>
171171
</Grid>
172172
</DockPanel>
173-
173+
-->
174174
</Grid>
175175
</Window>

0 commit comments

Comments
 (0)