ColorSpace per stop implemented on PPC.

Synchronization only when values change.
Volume open for all.
RGB to closest catalog item...

2 files changed, 16 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.xaml
index da8580488..b0b78c177 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.xaml
@@ -138,7 +138,7 @@
                                                     </Style.Triggers>
                                                 </Style>
                                             </Canvas.Style>
-                                            <TextBlock FontWeight="Bold" FontSize="11" Foreground="{StaticResource TangoPrimaryAccentBrush}" Canvas.Top="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight,Converter={StaticResource MathOperatorConverter},ConverterParameter='*-1'}" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchAutoComplete},Path=Watermark}">
+                                            <TextBlock FontWeight="Bold" FontSize="11" Foreground="{StaticResource TangoPrimaryAccentBrush}" Canvas.Top="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight,Converter={StaticResource MathOperatorConverter},ConverterParameter='*-1'}" Text="">
                                                 <TextBlock.Style>
                                                     <Style TargetType="TextBlock">
                                                         <Setter Property="Opacity" Value="0"></Setter>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
index 2a0caf13e..da5d5e34b 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
@@ -109,6 +109,16 @@ namespace Tango.Touch.Controls
         public static readonly DependencyProperty AutoCalculateJogStepProperty =
             DependencyProperty.Register("AutoCalculateJogStep", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(true));
 
+        public bool UpdateBindingOnlyWhenFocused
+        {
+            get { return (bool)GetValue(UpdateBindingOnlyWhenFocusedProperty); }
+            set { SetValue(UpdateBindingOnlyWhenFocusedProperty, value); }
+        }
+        public static readonly DependencyProperty UpdateBindingOnlyWhenFocusedProperty =
+            DependencyProperty.Register("UpdateBindingOnlyWhenFocused", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false));
+
+
+
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
@@ -222,8 +232,11 @@ namespace Tango.Touch.Controls
 
                 _lastValue = Value;
 
-                DoubleValueChangedEventArgs args = new DoubleValueChangedEventArgs(ValueChangedEvent, this, Value);
-                RaiseEvent(args);
+                if (!UpdateBindingOnlyWhenFocused || (_text_box != null && _text_box.IsKeyboardFocused))
+                {
+                    DoubleValueChangedEventArgs args = new DoubleValueChangedEventArgs(ValueChangedEvent, this, Value);
+                    RaiseEvent(args);
+                }
             }
         }