Skip to content

Commit c677b57

Browse files
JesseColJesseCol
committed
Calc: Step 0: Make some Xaml changes that will make it easier to deal with later
1 parent b12e230 commit c677b57

File tree

1 file changed

+109
-105
lines changed

1 file changed

+109
-105
lines changed

‎Samples/Islands/DrawingIsland/CalculatorDemo/MainWindow.xaml

Lines changed: 109 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -31,111 +31,115 @@
3131
</Style>
3232
</Window.Resources>
3333

34-
<DockPanel Name="MyPanel">
35-
<!--
36-
calc_update_tweaks: Remove the hardcoded hight to make the Menu taller so that the menu items can be fully visible.
37-
-->
38-
<Menu DockPanel.Dock="Top">
39-
<MenuItem Header="File">
40-
<MenuItem Click="OnMenuExit" Header="Exit" />
41-
</MenuItem>
42-
<MenuItem Header="View">
43-
<MenuItem Name="StandardMenu" Click="OnMenuStandard" IsCheckable="true" IsChecked="True"
44-
Header="Standard" />
45-
</MenuItem>
46-
<MenuItem Header="Help">
47-
<MenuItem Click="OnMenuAbout" Header="About" />
48-
</MenuItem>
49-
</Menu>
50-
<Grid Name="MyGrid" ShowGridLines="False">
51-
<Grid.ColumnDefinitions>
52-
<ColumnDefinition />
53-
<ColumnDefinition />
54-
<ColumnDefinition />
55-
<ColumnDefinition />
56-
<ColumnDefinition />
57-
<ColumnDefinition />
58-
<ColumnDefinition />
59-
<ColumnDefinition />
60-
<ColumnDefinition />
61-
</Grid.ColumnDefinitions>
62-
<Grid.RowDefinitions>
63-
<RowDefinition />
64-
<RowDefinition />
65-
<RowDefinition />
66-
<RowDefinition />
67-
<RowDefinition />
68-
<RowDefinition />
69-
</Grid.RowDefinitions>
70-
<Button Name="B7" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="2">7</Button>
71-
<Button Name="B8" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="2">8</Button>
72-
<Button Name="B9" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="2">9</Button>
73-
<Button Name="B4" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="3">4</Button>
74-
<Button Name="B5" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="3">5</Button>
75-
<Button Name="B6" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="3">6</Button>
76-
<Button Name="B1" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="4">1</Button>
77-
<Button Name="B2" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="4">2</Button>
78-
<Button Name="B3" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="4">3</Button>
79-
<Button Name="B0" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="5">0</Button>
80-
<Button Name="BPeriod" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="5">.</Button>
34+
<Grid x:Name="MainGrid">
35+
<DockPanel Name="MyPanel">
8136
<!--
82-
calc_update_tweaks: We add Style="{StaticResource GrayButton}" here to the Buttons we want to be gray to
83-
use the new Style we defined above.
37+
calc_update_tweaks: Remove the hardcoded hight to make the Menu taller so that the menu items can be fully visible.
8438
-->
85-
<Button Name="BPM" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="6" Grid.Row="5">+/-</Button>
86-
<Button Name="BDevide" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="2">/</Button>
87-
<Button Name="BMultiply" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="3">*</Button>
88-
<Button Name="BMinus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="4">-</Button>
89-
<Button Name="BPlus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="5">+</Button>
90-
<Button Name="BSqrt" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="2"
91-
ToolTip="Usage: 'A Sqrt'">
92-
Sqrt
93-
</Button>
94-
<Button Name="BPercent" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="3"
95-
ToolTip="Usage: 'A % B ='">
96-
%
97-
</Button>
98-
<Button Name="BOneOver" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="4"
99-
ToolTip="Usage: 'A 1/X'">
100-
1/X
101-
</Button>
102-
<!--
103-
calc_update_tweaks: Let's make the "=" Button an Accent button, so it's easy to find.
104-
-->
105-
<Button Name="BEqual" Click="OperBtn_Click" Grid.Column="8" Grid.Row="5"
106-
Foreground="{DynamicResource AccentButtonForeground}" Background="{DynamicResource AccentButtonBackground}">=</Button>
107-
<Button Name="BC" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="1"
108-
ToolTip="Clear All">
109-
C
110-
</Button>
111-
<Button Name="BCE" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="1"
112-
ToolTip="Clear Current Entry">
113-
CE
114-
</Button>
115-
<Button Name="BMemClear" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="2"
116-
ToolTip="Clear Memory">
117-
MC
118-
</Button>
119-
<Button Name="BMemRecall" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="3"
120-
ToolTip="Recall Memory">
121-
MR
122-
</Button>
123-
<Button Name="BMemSave" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="4"
124-
ToolTip="Store in Memory">
125-
MS
126-
</Button>
127-
<Button Name="BMemPlus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="5"
128-
ToolTip="Add To Memory">
129-
M+
130-
</Button>
131-
<TextBlock Name="BMemBox" Grid.Column="3" Grid.Row="1" Margin="10,17,10,17" Grid.ColumnSpan="2">Memory: [empty]</TextBlock>
39+
<Menu Name="MainMenu" DockPanel.Dock="Top">
40+
<MenuItem Header="File">
41+
<MenuItem Click="OnMenuExit" Header="Exit" />
42+
</MenuItem>
43+
<MenuItem Header="View">
44+
<MenuItem Name="StandardMenu" Click="OnMenuStandard" IsCheckable="true" IsChecked="True"
45+
Header="Standard" />
46+
</MenuItem>
47+
<MenuItem Header="Help">
48+
<MenuItem Click="OnMenuAbout" Header="About" />
49+
</MenuItem>
50+
</Menu>
51+
<Grid Name="MyGrid" ShowGridLines="False">
52+
<Grid.ColumnDefinitions>
53+
<ColumnDefinition />
54+
<ColumnDefinition />
55+
<ColumnDefinition />
56+
<ColumnDefinition />
57+
<ColumnDefinition />
58+
<ColumnDefinition />
59+
<ColumnDefinition />
60+
<ColumnDefinition />
61+
<ColumnDefinition />
62+
</Grid.ColumnDefinitions>
63+
<Grid.RowDefinitions>
64+
<RowDefinition />
65+
<RowDefinition />
66+
<RowDefinition />
67+
<RowDefinition />
68+
<RowDefinition />
69+
<RowDefinition />
70+
</Grid.RowDefinitions>
71+
<Button Name="B7" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="2">7</Button>
72+
<Button Name="B8" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="2">8</Button>
73+
<Button Name="B9" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="2">9</Button>
74+
<Button Name="B4" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="3">4</Button>
75+
<Button Name="B5" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="3">5</Button>
76+
<Button Name="B6" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="3">6</Button>
77+
<Button Name="B1" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="4">1</Button>
78+
<Button Name="B2" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="4">2</Button>
79+
<Button Name="B3" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="4">3</Button>
80+
<Button Name="B0" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="5">0</Button>
81+
<Button Name="BPeriod" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="5">.</Button>
82+
<!--
83+
calc_update_tweaks: We add Style="{StaticResource GrayButton}" here to the Buttons we want to be gray to
84+
use the new Style we defined above.
85+
-->
86+
<Button Name="BPM" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="6" Grid.Row="5">+/-</Button>
87+
<Button Name="BDevide" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="2">/</Button>
88+
<Button Name="BMultiply" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="3">*</Button>
89+
<Button Name="BMinus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="4">-</Button>
90+
<Button Name="BPlus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="5">+</Button>
91+
<Button Name="BSqrt" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="2"
92+
ToolTip="Usage: 'A Sqrt'">
93+
Sqrt
94+
</Button>
95+
<Button Name="BPercent" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="3"
96+
ToolTip="Usage: 'A % B ='">
97+
%
98+
</Button>
99+
<Button Name="BOneOver" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="4"
100+
ToolTip="Usage: 'A 1/X'">
101+
1/X
102+
</Button>
103+
<!--
104+
calc_update_tweaks: Let's make the "=" Button an Accent button, so it's easy to find.
105+
-->
106+
<Button Name="BEqual" Click="OperBtn_Click" Grid.Column="8" Grid.Row="5"
107+
Foreground="{DynamicResource AccentButtonForeground}" Background="{DynamicResource AccentButtonBackground}">=</Button>
108+
<Button Name="BC" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="1"
109+
ToolTip="Clear All">
110+
C
111+
</Button>
112+
<Button Name="BCE" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="1"
113+
ToolTip="Clear Current Entry">
114+
CE
115+
</Button>
116+
<Button Name="BMemClear" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="2"
117+
ToolTip="Clear Memory">
118+
MC
119+
</Button>
120+
<Button Name="BMemRecall" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="3"
121+
ToolTip="Recall Memory">
122+
MR
123+
</Button>
124+
<Button Name="BMemSave" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="4"
125+
ToolTip="Store in Memory">
126+
MS
127+
</Button>
128+
<Button Name="BMemPlus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="5"
129+
ToolTip="Add To Memory">
130+
M+
131+
</Button>
132+
<TextBlock Name="BMemBox" Grid.Column="3" Grid.Row="1" Margin="10,17,10,17" Grid.ColumnSpan="2">Memory: [empty]</TextBlock>
132133

133-
<!--
134-
calc_update_tweaks: Make the calculator text a little larger to be more visible.
135-
Also, make the TextBox borders a little less harsh.
136-
-->
137-
<local:MyTextBox Grid.ColumnSpan="9" x:Name="DisplayBox" Height="30" Margin="5" FontSize="20" BorderBrush="LightGray"/>
138-
<local:MyTextBox Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="5" x:Name="PaperBox" BorderBrush="LightGray"/>
139-
</Grid>
140-
</DockPanel>
141-
</Window>
134+
<!--
135+
calc_update_tweaks: Make the calculator text a little larger to be more visible.
136+
Also, make the TextBox borders a little less harsh.
137+
-->
138+
<local:MyTextBox Grid.ColumnSpan="9" x:Name="DisplayBox" Height="30" Margin="5" FontSize="20" BorderBrush="LightGray"/>
139+
<Border x:Name="DisplayAreaBorder" Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="5">
140+
<local:MyTextBox x:Name="PaperBox" BorderBrush="LightGray"/>
141+
</Border>
142+
</Grid>
143+
</DockPanel>
144+
</Grid>
145+
</Window>

0 commit comments

Comments
 (0)