From ecb6d7cb1818ddda41d3dfa6f31aaf1bcade0fd3 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 7 Sep 2015 11:31:38 +0000
Subject: [PATCH] =?UTF-8?q?SarmaxWall=20:=20-=20Aggiornate=20immagini=20Ab?=
 =?UTF-8?q?outBox.=20-=20Aggiornata=20immagine=20Delete=20in=20NumericKeyb?=
 =?UTF-8?q?oard.=20-=20Modificata=20NumericKeyboard=20affinch=C3=A8=20la?=
 =?UTF-8?q?=20window=20sia=20grande=20quanto=20necessario=20e=20non=20quan?=
 =?UTF-8?q?to=20la=20MainWindow.=20-=20Modificate=20chiamate=20alla=20Nume?=
 =?UTF-8?q?ricKeybord=20in=20conseguenza=20delle=20modifiche=20ad=20essa?=
 =?UTF-8?q?=20apportate.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AboutBoxWD.xaml                    |   3 +-
 AboutBoxWD.xaml.vb                 |   2 +-
 DrawPageUC.xaml                    |   6 +-
 MissingKeyWD.xaml                  |  34 +++++----
 NumericKeyboardWD.xaml             | 118 +++++++++++++----------------
 NumericKeyboardWD.xaml.vb          |  15 +++-
 PlacePageUC.xaml                   |   7 +-
 Resources/AboutBoxImage.png        | Bin 2062 -> 4169 bytes
 Resources/NumericKeyboardArrow.png | Bin 520 -> 624 bytes
 SarmaxWallDictionary.xaml.vb       |   6 +-
 10 files changed, 96 insertions(+), 95 deletions(-)

diff --git a/AboutBoxWD.xaml b/AboutBoxWD.xaml
index a78b25c..fee3522 100644
--- a/AboutBoxWD.xaml
+++ b/AboutBoxWD.xaml
@@ -30,7 +30,8 @@
                 <RowDefinition Height="0.5*"/>
             </Grid.RowDefinitions>
 
-            <Image Grid.Column="1" Grid.Row="1" Source="Resources/AboutBoxImage.png" Width="48" Height="48"/>
+            <Image Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Source="Resources/AboutBoxImage.png" Width="300"
+                Height="100" VerticalAlignment="Bottom"/>
             <Label Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
                 VerticalAlignment="Center" FontSize="18" />
             <Label Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
diff --git a/AboutBoxWD.xaml.vb b/AboutBoxWD.xaml.vb
index e648e93..1bea3fc 100644
--- a/AboutBoxWD.xaml.vb
+++ b/AboutBoxWD.xaml.vb
@@ -7,7 +7,7 @@ Public Class AboutBoxWD
 
     Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs)
         DescriptionLbl.Content = My.Application.Info.Description.ToString()
-        VersionLbl.Content = My.Application.Info.Version.ToString()
+        VersionLbl.Content = "Versione: " + My.Application.Info.Version.ToString()
         CopirightLbl.Content = My.Application.Info.Copyright.ToString()
         ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
     End Sub
diff --git a/DrawPageUC.xaml b/DrawPageUC.xaml
index 2eeb1ac..7e2ce4e 100644
--- a/DrawPageUC.xaml
+++ b/DrawPageUC.xaml
@@ -69,11 +69,7 @@
             <TextBox Name="TextBox4" Grid.Column="1" Grid.Row="8" Style="{StaticResource NumericKeyboard}"
                 FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
                 TextAlignment="Right"/>
-            <Label Name="MessageLabel" Grid.Row="9" Grid.ColumnSpan="2" Content="Label" FontSize="15"/>
-
-
-
-
+            <Label Name="MessageLabel" Grid.Row="9" Grid.ColumnSpan="2" Content="Label" FontSize="15" />
 
             <Button Name="AddBtn" Grid.Row="10" FontSize="15" />
             <Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" FontSize="15" />
diff --git a/MissingKeyWD.xaml b/MissingKeyWD.xaml
index 1834219..0efe6f3 100644
--- a/MissingKeyWD.xaml
+++ b/MissingKeyWD.xaml
@@ -1,35 +1,41 @@
 <Window x:Class="MissingKeyWD"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="MissingKeyWD" Height="300" Width="450" Initialized="MissingKeyWD_Initialized" WindowStyle="None" ShowInTaskbar="False" ResizeMode="NoResize">
+    Title="MissingKeyWD" Height="256" Width="409.2" Initialized="MissingKeyWD_Initialized" WindowStyle="None" ShowInTaskbar="False" ResizeMode="NoResize">
 
+    <!-- Chiamata al Dictionary -->
+    <Window.Resources>
+        <ResourceDictionary Source="SarmaxWallDictionary.xaml"/>
+    </Window.Resources>
+    
     <!-- Definizione della MissingKeyWindow -->
     <Border BorderBrush="Black" BorderThickness="1">
 
         <!-- ** Definizione della Grid della MissingKeyWindow ** -->
         <Grid Name="MissingKeyGrid">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="8*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="0.5*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.25*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.25*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.5*"/>
             </Grid.RowDefinitions>
         
             <Label Name="ErrorLbl" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"
                 Foreground="Red" FontSize="25" />
-            <Label Name="MissingKeyLbl" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Center"
-                VerticalAlignment="Center" FontSize="18"/>
-            <Label Name="InsertKeyLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-                VerticalAlignment="Center" FontSize="18" />
-            <Button Name="ExitBtn" Grid.Column="1" Grid.Row="5" FontSize="18"/>
+            <Label Name="MissingKeyLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
+                VerticalAlignment="Center" FontSize="15"/>
+            <Label Name="InsertKeyLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
+                VerticalAlignment="Center" FontSize="15" />
+            <Button Name="ExitBtn" Grid.Column="1" Grid.Row="6" FontSize="18"/>
 
         </Grid>
 
diff --git a/NumericKeyboardWD.xaml b/NumericKeyboardWD.xaml
index e6439ad..4996ab8 100644
--- a/NumericKeyboardWD.xaml
+++ b/NumericKeyboardWD.xaml
@@ -1,85 +1,73 @@
 <Window x:Class="NumericKeyboardWD"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="NumericKeyboardWD" Height="768" Width="1024" Background="Transparent" ResizeMode="NoResize"
+    Title="NumericKeyboardWD" Height="320" Width="341.3" Background="Transparent" ResizeMode="NoResize"
     ShowInTaskbar="False" AllowsTransparency="True" WindowStyle="None" IsVisibleChanged="NumericKeyboardWD_IsVisibleChanged" Unloaded="NumericKeyboardWD_Unloaded" KeyDown="NumericKeyboardWD_KeyDown" Initialized="NumericKeyboardWD_Initialized">
 
     <!-- Chiamata al Dictionary -->
     <Window.Resources>
         <ResourceDictionary Source="SarmaxWallDictionary.xaml"/>
     </Window.Resources>
+        
+        <!-- Definizione della NumericKeyboard -->
+    <Border Grid.Row="2" Grid.Column="2" BorderBrush="Black" BorderThickness="0" Background="Gray" CornerRadius="3">
 
-    <!-- Definizione della NumericKeyboard -->
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="7*"/>
-            <RowDefinition Height="5*"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="7*"/>
-            <ColumnDefinition Width="5*"/>
-        </Grid.ColumnDefinitions>
+        <Grid Grid.Row="2" Grid.Column="2" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
 
-        <Border Grid.Row="2" Grid.Column="2" BorderBrush="Black" BorderThickness="0" Background="Gray" CornerRadius="3">
-
-            <Grid Grid.Row="2" Grid.Column="2" >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                </Grid.RowDefinitions>
-
-                <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" BorderThickness="1,1,1,0"
+            <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" BorderThickness="1,1,1,0"
                     CornerRadius="3,3,0,0" BorderBrush="DarkGray" >
-                    <TextBlock Text="Lato A" FontSize="25" Name="NumericKeyboardWDTitle" Background="#FFDDDDDD" 
+                <TextBlock Text="Lato A" FontSize="25" Name="NumericKeyboardWDTitle" Background="#FFDDDDDD" 
                         Padding="3,0,0,0"/>
-                </Border>
-                <TextBox Text="100" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
+            </Border>
+            <TextBox Text="100" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
                     TextAlignment="Right" FontSize="25" Name="NumericKeyboardWDTextBox" />
 
-                <Button Content="7" Grid.Row="2" Grid.Column="0" FontSize="40" Click="Btn7WD_Click" />
-                <Button Content="8" Grid.Row="2" Grid.Column="1" FontSize="40" Click="Btn8WD_Click" />
-                <Button Content="9" Grid.Row="2" Grid.Column="2" FontSize="40" Click="Btn9WD_Click" />
-                <Button Grid.Row="2" Grid.Column="3" FontSize="40" Click="BtnDeleteWD_Click" >
-                    <Image Source="Resources/NumericKeyboardArrow.png" Width="50" Height="50" HorizontalAlignment="Center"
+            <Button Content="7" Grid.Row="2" Grid.Column="0" FontSize="40" Click="Btn7WD_Click" />
+            <Button Content="8" Grid.Row="2" Grid.Column="1" FontSize="40" Click="Btn8WD_Click" />
+            <Button Content="9" Grid.Row="2" Grid.Column="2" FontSize="40" Click="Btn9WD_Click" />
+            <Button Grid.Row="2" Grid.Column="3" FontSize="40" Click="BtnDeleteWD_Click" >
+                <Image Source="Resources/NumericKeyboardArrow.png" Width="50" Height="50" HorizontalAlignment="Center"
                     VerticalAlignment="Center" />
-                </Button>
-                <Button Grid.Column="4" Content="C" Grid.Row="2"  FontSize="40" Click="BtnCancelWD_Click" />
-                <Button Grid.Column="0" Content="4" Grid.Row="3"  FontSize="40" Click="Btn4WD_Click" />
-                <Button Grid.Column="1" Content="5" Grid.Row="3"  FontSize="40" Click="Btn5WD_Click" />
-                <Button Grid.Column="2" Content="6" Grid.Row="3"  FontSize="40" Click="Btn6WD_Click" />
-                <Button Grid.Column="3" Content="+" Grid.Row="3"  FontSize="40" Click="BtnPlusWD_Click" />
-                <Button Grid.Column="4" Content="*" Grid.Row="3"  FontSize="40" Click="BtnMultiplicationWD_Click" />
-                <Button Grid.Column="0" Content="1" Grid.Row="4"  FontSize="40" Click="Btn1WD_Click" />
-                <Button Grid.Column="1" Content="2" Grid.Row="4"  FontSize="40" Click="Btn2WD_Click" />
-                <Button Grid.Column="2" Content="3" Grid.Row="4"  FontSize="40" Click="Btn3WD_Click" />
-                <Button Grid.Column="3" Content="-" Grid.Row="4"  FontSize="40" Click="BtnMinusWD_Click" />
-                <Button Grid.Column="4" Content="/" Grid.Row="4"  FontSize="40" Click="BtnDivisionWD_Click" />
-                <Button Grid.Column="0" Content="0" Grid.Row="5"  FontSize="40" Click="Btn0WD_Click"/>
-                <Button Grid.Column="1" Content="." Grid.Row="5"  FontSize="40" Click="BtnDotWD_Click" />
-                <Button Grid.Column="2" Content="=" Grid.Row="5"  FontSize="40" Click="BtnEvaluateWD_Click" />
-                <Button Grid.Row="5" Grid.Column="3" FontSize="40" Click="BtnApplyWD_Click" >
-                    <Image Source="Resources/V.png" Width="65" Height="65" HorizontalAlignment="Center"
+            </Button>
+            <Button Grid.Column="4" Content="C" Grid.Row="2"  FontSize="40" Click="BtnCancelWD_Click" />
+            <Button Grid.Column="0" Content="4" Grid.Row="3"  FontSize="40" Click="Btn4WD_Click" />
+            <Button Grid.Column="1" Content="5" Grid.Row="3"  FontSize="40" Click="Btn5WD_Click" />
+            <Button Grid.Column="2" Content="6" Grid.Row="3"  FontSize="40" Click="Btn6WD_Click" />
+            <Button Grid.Column="3" Content="+" Grid.Row="3"  FontSize="40" Click="BtnPlusWD_Click" />
+            <Button Grid.Column="4" Content="*" Grid.Row="3"  FontSize="40" Click="BtnMultiplicationWD_Click" />
+            <Button Grid.Column="0" Content="1" Grid.Row="4"  FontSize="40" Click="Btn1WD_Click" />
+            <Button Grid.Column="1" Content="2" Grid.Row="4"  FontSize="40" Click="Btn2WD_Click" />
+            <Button Grid.Column="2" Content="3" Grid.Row="4"  FontSize="40" Click="Btn3WD_Click" />
+            <Button Grid.Column="3" Content="-" Grid.Row="4"  FontSize="40" Click="BtnMinusWD_Click" />
+            <Button Grid.Column="4" Content="/" Grid.Row="4"  FontSize="40" Click="BtnDivisionWD_Click" />
+            <Button Grid.Column="0" Content="0" Grid.Row="5"  FontSize="40" Click="Btn0WD_Click"/>
+            <Button Grid.Column="1" Content="." Grid.Row="5"  FontSize="40" Click="BtnDotWD_Click" />
+            <Button Grid.Column="2" Content="=" Grid.Row="5"  FontSize="40" Click="BtnEvaluateWD_Click" />
+            <Button Grid.Row="5" Grid.Column="3" FontSize="40" Click="BtnApplyWD_Click" >
+                <Image Source="Resources/V.png" Width="65" Height="65" HorizontalAlignment="Center"
                     VerticalAlignment="Center" />
-                </Button>
-                <Button Grid.Row="5" Grid.Column="4" FontSize="40" Click="BtnExitWD_Click" >
-                    <Image Source="Resources/X.png" Width="65" Height="65" HorizontalAlignment="Center"
+            </Button>
+            <Button Grid.Row="5" Grid.Column="4" FontSize="40" Click="BtnExitWD_Click" >
+                <Image Source="Resources/X.png" Width="65" Height="65" HorizontalAlignment="Center"
                     VerticalAlignment="Center" />
-                </Button>
+            </Button>
 
-            </Grid>
-        </Border>
-
-    </Grid>
+        </Grid>
+    </Border>
+    
 </Window>
diff --git a/NumericKeyboardWD.xaml.vb b/NumericKeyboardWD.xaml.vb
index 1dee404..d941f68 100644
--- a/NumericKeyboardWD.xaml.vb
+++ b/NumericKeyboardWD.xaml.vb
@@ -17,6 +17,8 @@ Public Class NumericKeyboardWD
         If Me.IsVisible Then
             NumericKeyboardWDTextBox.Text = m_CurrentTxBx.Text
             NumericKeyboardWDTitle.Text = m_CurrentLbl
+        Else
+            NumericKeyboardWDTitle.Foreground = Brushes.Black
         End If
     End Sub
 
@@ -105,12 +107,19 @@ Public Class NumericKeyboardWD
     End Sub
 
     Private Sub BtnCancelWD_Click(sender As Object, e As RoutedEventArgs)
-        NumericKeyboardWDTextBox.Text = String.Empty
+        If m_bErrorState Then
+            NumericKeyboardWDTextBox.Text = String.Empty
+            NumericKeyboardWDTitle.Foreground = Brushes.Black
+            NumericKeyboardWDTitle.Text = m_CurrentLbl
+            m_bErrorState = False
+        Else
+            NumericKeyboardWDTextBox.Text = String.Empty
+        End If
     End Sub
 
     Private Sub BtnExitWD_Click(sender As Object, e As RoutedEventArgs)
-        NumericKeyboardWDTextBox.Text = String.Empty
         Visibility = Windows.Visibility.Hidden
+        NumericKeyboardWDTextBox.Text = String.Empty
     End Sub
 
     Private Sub BtnApplyWD_Click(sender As Object, e As RoutedEventArgs)
@@ -140,4 +149,4 @@ Public Class NumericKeyboardWD
         End If
     End Sub
 
-End Class
+End Class
\ No newline at end of file
diff --git a/PlacePageUC.xaml b/PlacePageUC.xaml
index bed1c74..4fd2d74 100644
--- a/PlacePageUC.xaml
+++ b/PlacePageUC.xaml
@@ -34,9 +34,10 @@
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
-                <RowDefinition Height="4.5*"/>
+                <RowDefinition Height="4*"/>
             </Grid.RowDefinitions>
 
             <Label Name="WallPositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
@@ -66,9 +67,9 @@
                 VerticalAlignment="Center" />
             </Button>
 
-            <Button Name="RemoveWallBtn" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3" FontSize="15" />
+            <Button Name="RemoveWallBtn" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" FontSize="15" />
 
-            <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2">
+            <UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2">
                 <TextBlock Name="LayerThicknessLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
                     HorizontalAlignment="Center" FontSize="15" TextWrapping="WrapWithOverflow" Width="75"
                     TextAlignment="Center" />
diff --git a/Resources/AboutBoxImage.png b/Resources/AboutBoxImage.png
index 3e1ef7606ba5e5cc048a0a23f1a7f8080a7cf2ba..a11230b23350efcbcdcc6b04c18d23d73ee78359 100644
GIT binary patch
literal 4169
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
T;3P>A00000NkvXXu0mjfDVn*3

literal 2062
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
b*(Mf1iZts=>Vei);|(1V62)m`CFTAH0lGfo

diff --git a/Resources/NumericKeyboardArrow.png b/Resources/NumericKeyboardArrow.png
index 1ea130fb481f9ca32751ad89f96d71c8c486237f..071f1c1af8099953e563e167c321fd7f3aad7135 100644
GIT binary patch
delta 541
zcmeBR`M@$EuKus5i(^Q|tv7dG2Oe^eV7>4lqCqu*{RU%MgKPq87HbmgEyf#-vJULG
z8cP^tAGn39WgK!A=&U|>=KJ)EXXn1*ovC`70Xt}jFHYjr;C9tNb0H|;3a>Gzu`r+A
z*26Z(1J1NG#~Azk_tt1}u3umAUUYI-0*Cvdy^l&gHCmJ%*H#=%&+aQw+0^>QoTIfs
zB`I{hKp#u#wKt-NK05bG+0WWm{vq<Rfxc->^Kk>_kFjq=zenHG{CE1xw~Y^un{pm2
zopJk2_ols8UkbK7zPspY5U2ab@H@vZbrzhdKKfj&so+fM<GW7lEd<=zFKM^cfBYC?
zaL4l5-bZHl3<dgH;|ibpDayFcy`ep8TAW2!+s(XvpPtE!U7Bs6?5!u0`bj+Id7|E-
z9^JhKQ!2TNrJm{iuF&o(sJYBtJgxGpj*RH1w@;1o%zt$hOp!X;5c5j;P++RS_F2}`
z-7HS|B+Fa&J{5ha@m5*9aCc?l%9h2e`s?Q$wR?0i+(PTO$G)pJJ92(sT=DY$-7{sy
zHj4Mx<z@Z&-*0<$?X>pf+0DLurm70{yJm8*ht?I%h_VpceDb^jhx?*ymKnM-o%yDx
zftCjRTwHkQ;GxCu11utzNpF{WxL{Mi#R^{R@xxI6)VD#5ks(}IH1)!1iH{&vp00i_
I>zopr0K|st=>Px#

literal 520
zcmeAS@N?(olHy`uVBq!ia0vp^?I6s-1|)5sdx0c43p^r=85qQcK$tOo{w0tq$r9Iy
zlHmNblJdl&R0hYC{G?O`&)mfH)S%SFl*+=BsWuD@j8i>b978H@y}299d&oef;i8j3
zgNV)p22PKe!b=nwRT`LO4oFqpIb0WX?e1Lto$oiyo08(~?lnop6CM33E8twVo%_dJ
zy|*^EcShgK%w;}g5glf6pn;hOjnEZkmndjpgc6LmSz15-=-p+l_q91)B0sp~fI%Tb
z7RGXK-G2VA(Dxixm|++0!=%_Hv>M@d1aQhE9AIRVNyt#*GkEY~4P$aFuch|x{O7aw
zgx8q9wo7?lvGhG-%zKgVo0&Ld4l}dxIXsY%S14d$Vpq^=U>2}oXk-=;J;cZ%({KPp
zWbi>52N*k^fkmK1$Ew2+MIBtz`{V9i`ccoC5p$@*x?L7zBm<1tVguI?Gg3o<&*94I
oKRf<EG4enUMHSD|Z-NO77rT#IF8$YS35-PsPgg&ebxsLQ0K}B9c>n+a

diff --git a/SarmaxWallDictionary.xaml.vb b/SarmaxWallDictionary.xaml.vb
index 4960c0a..4b80297 100644
--- a/SarmaxWallDictionary.xaml.vb
+++ b/SarmaxWallDictionary.xaml.vb
@@ -12,10 +12,10 @@
         If (Not IsNothing(AssocLabel)) Then
             m_NumericKeyboardWD.m_CurrentLbl = AssocLabel.Content
         End If
-        m_NumericKeyboardWD.Top = m_MainWindowUC.Top
+        m_NumericKeyboardWD.Top = m_MainWindowUC.Top + (m_MainWindowUC.Height / 12)
         m_NumericKeyboardWD.Left = m_MainWindowUC.Left
-        m_NumericKeyboardWD.Height = m_MainWindowUC.Height
-        m_NumericKeyboardWD.Width = m_MainWindowUC.Width
+        m_NumericKeyboardWD.Height = m_MainWindowUC.Height / 12 * 5
+        m_NumericKeyboardWD.Width = m_MainWindowUC.Width / 15 * 5
         m_NumericKeyboardWD.Visibility = Visibility.Visible
     End Sub