merge

1 files changed, 34 insertions, 311 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
index c5bb2001c..53fdc25d3 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
@@ -1,323 +1,46 @@
 <Window x:Class="Tango.UITests.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:colorpic="clr-namespace:Tango.ColorPickers;assembly=Tango.ColorPickers"
+        xmlns:collection="clr-namespace:System.Collections;assembly=mscorlib"
+        xmlns:local="clr-namespace:Tango.UITests"
+        xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+        xmlns:components="clr-namespace:Tango.Touch.Components;assembly=Tango.Touch"
+        xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+		xmlns:keyboard="clr-namespace:Tango.Touch.Keyboard;assembly=Tango.Touch"
+        xmlns:aero="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+        xmlns:stubs="clr-namespace:Tango.Stubs.Views;assembly=Tango.Stubs"
+        xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+        xmlns:commonControls="clr-namespace:Tango.PPC.Common.Controls;assembly=Tango.PPC.Common"
+        xmlns:explorer="clr-namespace:Tango.Explorer;assembly=Tango.Explorer"
         mc:Ignorable="d"
-        Title="MainWindow" Height="700" Width="800" DataContext="{Binding RelativeSource={RelativeSource Self}}" >
+        Title="MainWindow" Height="700" Width="800" DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
     <Grid>
-        <TabControl Margin="5" TabStripPlacement="Top">
-            <TabControl.Resources>
-                <Style TargetType="TabPanel">
-                    <Setter Property="HorizontalAlignment" Value="Center"/>
-                </Style>
-                <Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
-                    <Setter Property="Padding" Value="20,2"></Setter>
-                </Style>
-            </TabControl.Resources>
-            <TabItem Header="HSB" Padding="5">
-                <Grid >
-                    <Grid.Background>
-                        <SolidColorBrush Color="{Binding ElementName=HSBPicker, Path=SelectedColor}"/>
-                    </Grid.Background>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"></ColumnDefinition>
-                        <ColumnDefinition Width="1*"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0" Orientation="Vertical"  Height="Auto"  HorizontalAlignment="Center" Width="Auto" VerticalAlignment="Top"  Margin="10 50 0 0">
-                        <StackPanel Orientation="Horizontal"  Margin="0 10 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">H:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="HHSBColor" Text="230" FontSize="22" Margin="2" ></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="Auto" HorizontalAlignment="Left" Margin="0 30 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">S:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="SHSBColor"  Text="100"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">B:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="BHSBColor"  Text="50" FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65"  TextWrapping="Wrap">Thumb height:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center">
-                                <TextBox  x:Name="HSBThumbHeightProp"  Text="16"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock  FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold" Width="65" TextWrapping="Wrap" >Thumb color:</TextBlock>
-                            <Border Width="90" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="HSBThumbColorProp"   Text="#F4F4F4"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Vertical">
-                        <colorpic:HsbColorPicker  x:Name="HSBPicker"  Width="400" Height="400" Background="White" Foreground="Black" BorderBrush="Gainsboro" BorderThickness="0.8"
-                                                   H="{Binding ElementName=HHSBColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  
-                                                   S="{Binding ElementName=SHSBColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                   B="{Binding ElementName=BHSBColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                   ThumbHeight="{Binding ElementName=HSBThumbHeightProp, Path=Text}"
-                                                   ThumbColor="{Binding ElementName=HSBThumbColorProp, Path=Text}"/>
-                        
-                        <TextBlock Background="LightGray" Margin="0 50 0 0" HorizontalAlignment="Center" Foreground="Black" Width="400" FontSize="24" Height="Auto" MinHeight="40" FontWeight="DemiBold">
-                            <Run Text="RGB Color:    " />
-                            <Run Text="{Binding ElementName=HSBPicker, Path=SelectedColor}"/>
-                        </TextBlock>
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-            <TabItem Header="RGB" Padding="5">
-                <Grid >
-                    <Grid.Background>
-                        <SolidColorBrush Color="{Binding ElementName=RGBPicker, Path=SelectedColor}"/>
-                    </Grid.Background>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"></ColumnDefinition>
-                        <ColumnDefinition Width="1*"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0" Orientation="Vertical"  Height="Auto"  HorizontalAlignment="Center" Width="Auto" VerticalAlignment="Top"  Margin="10 50 0 0">
-                        <StackPanel Orientation="Horizontal"  Margin="0 10 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">R:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="RRGBColor" Text="30" FontSize="22" Margin="2" ></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="Auto" HorizontalAlignment="Left" Margin="0 30 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">G:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="GRGBColor"  Text="100"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel  Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">B:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="BRGBColor"  Text="220" FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock  FontSize="20" VerticalAlignment="Top" FontWeight="DemiBold"  Width="65"  TextWrapping="Wrap">Thumb height:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center">
-                                <TextBox  x:Name="RGBThumbHeightProp"  Text="16"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold" Width="65" TextWrapping="Wrap" >Thumb color:</TextBlock>
-                            <Border Width="90" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="RGBThumbColorProp"   Text="#F4F4F4"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-
-                    <StackPanel Grid.Column="1"  VerticalAlignment="Center" Orientation="Vertical">
-                        <colorpic:RgbColorPicker  x:Name="RGBPicker"  SelectedColor="#5C3D99" Width="400" Height="300" Background="White" Foreground="Black" BorderBrush="Gainsboro" BorderThickness="0.8" 
-                                                  R="{Binding ElementName=RRGBColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  
-                                                   G="{Binding ElementName=GRGBColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                   B="{Binding ElementName=BRGBColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                   ThumbHeight="{Binding ElementName=RGBThumbHeightProp, Path=Text}"
-                                                   ThumbColor="{Binding ElementName=RGBThumbColorProp, Path=Text}"/>
-
-                        <TextBlock Margin="0 50 0 0"  Background="LightGray" HorizontalAlignment="Center" Foreground="Black"  Width="400" FontSize="24" Height="Auto" MinHeight="40" FontWeight="DemiBold">
-                            <Run Text="RGB Color:    " />
-                            <Run Text="{Binding ElementName=RGBPicker, Path=SelectedColor}"/>
-                        </TextBlock>
-                    </StackPanel>
-                </Grid>
-                </TabItem>
-
-            <TabItem Header="CMYK" Padding="5">
-                <Grid >
-                    <Grid.Background>
-                        <SolidColorBrush Color="{Binding ElementName=CmykPicker, Path=SelectedColor}"/>
-                    </Grid.Background>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"></ColumnDefinition>
-                        <ColumnDefinition Width="1*"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0" Orientation="Vertical"  Height="Auto"  HorizontalAlignment="Center" Width="Auto" VerticalAlignment="Top"  Margin="10 50 0 0">
-                        <StackPanel Orientation="Horizontal"  Margin="0 10 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">C:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="CCMYKColor" Text="60" FontSize="22" Margin="2" ></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="Auto" HorizontalAlignment="Left" Margin="0 30 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">M:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="MCMYKColor"  Text="20"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">Y:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="YCMYKColor"  Text="80" FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">K:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="KCMYKColor"  Text="20" FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock  FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65"  TextWrapping="Wrap">Thumb height:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center">
-                                <TextBox  x:Name="CMYKThumbHeightProp"  Text="16"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock  FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold" Width="65" TextWrapping="Wrap" >Thumb color:</TextBlock>
-                            <Border Width="90" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="CMYKThumbColorProp"   Text="#F4F4F4"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Orientation="Vertical"  Margin="10 60 0 0">
-                        <colorpic:CmykColorPicker  x:Name="CmykPicker"  Width="400" Height="400" Background="White" Foreground="Black" BorderBrush="Gainsboro" BorderThickness="0.8" 
-                                                   Cyan="{Binding ElementName=CCMYKColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                                                   Magenta="{Binding ElementName=MCMYKColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  
-                                                   Yellow="{Binding ElementName=YCMYKColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                   Key="{Binding ElementName=KCMYKColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                   ThumbHeight="{Binding ElementName=CMYKThumbHeightProp, Path=Text}"
-                                                   ThumbColor="{Binding ElementName=CMYKThumbColorProp, Path=Text}"/>
-                        <TextBlock Margin="0 50 0 0" HorizontalAlignment="Center" Background="LightGray" Foreground="Black" Width="400" FontSize="24" Height="Auto" MinHeight="40" FontWeight="DemiBold">
-                            <Run Text="RGB Color:    " />
-                            <Run Text="{Binding ElementName=CmykPicker, Path=SelectedColor}"/>
-                        </TextBlock>
-                    </StackPanel>
-                </Grid>
-            </TabItem>
+        <touch:TouchPanel>
+            <touch:LightTouchScrollViewer>
+                <Border Width="500" Height="500" Margin="0 40 0 0">
+                    <Grid>
+                        <aero:SystemDropShadowChrome CornerRadius="5" Color="Gray" Margin="-3">
+                            <aero:SystemDropShadowChrome.RenderTransform>
+                                <TranslateTransform X="-5" Y="-5"></TranslateTransform>
+                            </aero:SystemDropShadowChrome.RenderTransform>
+                        </aero:SystemDropShadowChrome>
+                        <Border BorderThickness="1" BorderBrush="Gray" Background="White" CornerRadius="5">
 
-            <TabItem Header="LAB" Padding="5">
-                <Grid>
-                    <Grid.Background>
-                        <SolidColorBrush Color="{Binding ElementName=LabPicker, Path=SelectedColor}"/>
-                    </Grid.Background>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"></ColumnDefinition>
-                        <ColumnDefinition Width="1*"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0" Orientation="Vertical"  Height="Auto"  HorizontalAlignment="Center" Width="Auto" VerticalAlignment="Top"  Margin="10 50 0 0">
-                        <StackPanel Orientation="Horizontal"  Margin="0 10 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">L:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="LLabColor" Text="77" FontSize="22" Margin="2" ></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="Auto" HorizontalAlignment="Left" Margin="0 30 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">A:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="ALabColor"  Text="89"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">B:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="BLabColor"  Text="89" FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock  FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65"  TextWrapping="Wrap">Thumb height:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center">
-                                <TextBox  x:Name="ThumbHeightProp"  Text="16"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold" Width="65" TextWrapping="Wrap" >Thumb color:</TextBlock>
-                            <Border Width="90" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="ThumbColorProp"   Text="#F4F4F4"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Orientation="Vertical"  Margin="10 60 0 0">
-                        <colorpic:LabColorPicker  x:Name="LabPicker"  
-                                                  L="{Binding ElementName=LLabColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                                                  A="{Binding ElementName=ALabColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  
-                                                  B="{Binding ElementName=BLabColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   
-                                                  ThumbHeight="{Binding ElementName=ThumbHeightProp, Path=Text}"
-                                                  ThumbColor="{Binding ElementName=ThumbColorProp, Path=Text}"
-                                                  Width="400" Height="400" Background="White" Foreground="Black" BorderBrush="Gainsboro" BorderThickness="0.8" />
-                        <TextBlock Margin="0 50 0 0" HorizontalAlignment="Center" Background="LightGray" Foreground="Black" Width="400" FontSize="24" Height="Auto" MinHeight="40" FontWeight="DemiBold">
-                            <Run Text="RGB Color:    " />
-                            <Run Text="{Binding ElementName=LabPicker, Path=SelectedColor}"/>
-                        </TextBlock>
-                    </StackPanel>
-                </Grid>
-            </TabItem>
+                        </Border>
+                        
+                        <StackPanel>
+                            <touch:TouchNumericTextBox HorizontalAlignment="Center" VerticalAlignment="Center" Width="200"></touch:TouchNumericTextBox>
+                            <touch:TouchNumericTextBox Margin="0 40 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="200"></touch:TouchNumericTextBox>
 
-            <TabItem Header="LCH" Padding="5">
-                <Grid >
-                    <Grid.Background>
-                        <SolidColorBrush Color="{Binding ElementName=LchPicker, Path=SelectedColor}"/>
-                    </Grid.Background>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"></ColumnDefinition>
-                        <ColumnDefinition Width="1*"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0" Orientation="Vertical"  Height="Auto"  HorizontalAlignment="Center" Width="Auto" VerticalAlignment="Top"  Margin="10 50 0 0">
-                        <StackPanel Orientation="Horizontal"  Margin="0 10 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">L:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="LLCHColor" Text="54" FontSize="22" Margin="2" ></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="Auto" HorizontalAlignment="Left" Margin="0 30 0 0">
-                            <TextBlock FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">C:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6"  VerticalAlignment="Center" Margin="20 0 0 0">
-                                <TextBox x:Name="CLCHColor"  Text="55"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="24" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65">H:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="HLCHColor"  Text="120" FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock  FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold"  Width="65"  TextWrapping="Wrap">Thumb height:</TextBlock>
-                            <Border Width="80" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center">
-                                <TextBox  x:Name="LCHThumbHeightProp"  Text="16"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal"  Margin="0 30 0 0">
-                            <TextBlock   FontSize="20" VerticalAlignment="Center" FontWeight="DemiBold" Width="65" TextWrapping="Wrap" >Thumb color:</TextBlock>
-                            <Border Width="90" Background="White" CornerRadius="6" Margin="20 0 0 0" VerticalAlignment="Center" >
-                                <TextBox  x:Name="LCHThumbColorProp"   Text="#F4F4F4"  FontSize="22" Margin="2"></TextBox>
-                            </Border>
+                            <TextBox Margin="0 40 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="200" Height="40"></TextBox>
+                            <TextBox Margin="0 40 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="200" Height="40"></TextBox>
                         </StackPanel>
-                    </StackPanel>
-                    <StackPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Vertical">
-                        <colorpic:LchColorPicker  x:Name="LchPicker"  Width="400" Height="300" Background="White" Foreground="Black" BorderBrush="Gainsboro" BorderThickness="0.8" 
-                                                  L="{Binding ElementName=LLCHColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                                                  C="{Binding ElementName=CLCHColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  
-                                                  H="{Binding ElementName=HLCHColor, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   
-                                                  ThumbHeight="{Binding ElementName=LCHThumbHeightProp, Path=Text}"
-                                                  ThumbColor="{Binding ElementName=LCHThumbColorProp, Path=Text}"/>
-                        <TextBlock Margin="0 50 0 0" HorizontalAlignment="Center" Background="LightGray" Foreground="Black" Width="400" FontSize="24" Height="Auto" MinHeight="40" FontWeight="DemiBold">
-                            <Run Text="RGB Color:    " />
-                            <Run Text="{Binding ElementName=LchPicker, Path=SelectedColor}"/>
-                        </TextBlock>
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-
-        </TabControl>
-        
-       
-
-
-        <!--<controls:MultiSelectComboBox  Width="250" Height="60"  Background="White" Foreground="Black"
-                                          x:Name="MSCombobox" 
-                                          BorderBrush="Gainsboro" BorderThickness="0.8" 
-                                          Items="{Binding Items}" 
-                                          SelectedItemsList ="{Binding SelectedItems}"/>-->
-
-    
+                    </Grid>
+                </Border>
+            </touch:LightTouchScrollViewer>
+        </touch:TouchPanel>
     </Grid>
 </Window>