From 79ffa1774217400bd750f6a85df9f969429580c3 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 3 Mar 2018 00:52:22 +0200
Subject: Added Delta Resolution for Hive Color Picker. Implemented Embroidery
 PMR. Implemented Embroidery Native Adapter.

---
 .../Tango.MachineStudio.Developer/Views/JobView.xaml     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 64d20a62c..49444750f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -157,7 +157,7 @@
                                 </StackPanel>
                             </ToggleButton>
                             <Popup x:Name="Popup" MouseDown="Popup_MouseDown" PopupAnimation="Fade" StaysOpen="False" PlacementTarget="{Binding ElementName=PopupButton}"  Placement="Bottom" AllowsTransparency="True">
-                                <Border Background="#E6FFFFFF" Height="250" Width="500" CornerRadius="5" Margin="10">
+                                <Border Background="#E6FFFFFF" Height="250" Width="550" CornerRadius="5" Margin="10">
                                     <Border.Effect>
                                         <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
                                     </Border.Effect>
@@ -737,12 +737,7 @@
                                                                                                                             </mahapps:NumericUpDown>
                                                                                                                         </ContentControl>
 
-                                                                                                                        <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
-                                                                                                                            <Rectangle.Fill>
-                                                                                                                                <SolidColorBrush Color="{Binding Color}">
-                                                                                                                                </SolidColorBrush>
-                                                                                                                            </Rectangle.Fill>
-                                                                                                                        </Rectangle>
+                                                                                                                        <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
@@ -775,12 +770,7 @@
                                                                                                                             </mahapps:NumericUpDown>
                                                                                                                         </ContentControl>
 
-                                                                                                                        <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
-                                                                                                                            <Rectangle.Fill>
-                                                                                                                                <SolidColorBrush Color="{Binding Color}">
-                                                                                                                                </SolidColorBrush>
-                                                                                                                            </Rectangle.Fill>
-                                                                                                                        </Rectangle>
+                                                                                                                        <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
-- 
cgit v1.3.1