aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Touch/Controls
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2022-06-28 13:22:54 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2022-06-28 13:22:54 +0300
commitc2c59833f0f946418b69b935c62867ca5fcccd49 (patch)
tree7af92b01fc4cd2287b0be36f1d63527e1f72e7aa /Software/Visual_Studio/Tango.Touch/Controls
parent59eed0566df33cd821995637e7a7328fa747bc4e (diff)
downloadTango-c2c59833f0f946418b69b935c62867ca5fcccd49.tar.gz
Tango-c2c59833f0f946418b69b935c62867ca5fcccd49.zip
PPC. Gui changes.
Related Work Items: #6695, #6725
Diffstat (limited to 'Software/Visual_Studio/Tango.Touch/Controls')
-rw-r--r--Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs9
-rw-r--r--Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml3
2 files changed, 11 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
index 77891b36b..dbda2320e 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
@@ -131,6 +131,15 @@ namespace Tango.Touch.Controls
public static readonly DependencyProperty UpdateBindingOnlyWhenFocusedProperty =
DependencyProperty.Register("UpdateBindingOnlyWhenFocused", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false));
+ public Brush RippleBrush
+ {
+ get { return (Brush)GetValue(RippleBrushProperty); }
+ set { SetValue(RippleBrushProperty, value); }
+ }
+ public static readonly DependencyProperty RippleBrushProperty =
+ DependencyProperty.Register("RippleBrush", typeof(Brush), typeof(TouchNumericTextBox), new PropertyMetadata(new SolidColorBrush(Color.FromRgb(189,189,189)) { Opacity = 0.28 }));
+
+
public virtual bool HasError
{
get
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
index f26e53e73..ff4756160 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
@@ -87,7 +87,8 @@
</Grid>
<Grid>
- <components:Ripple RippleBrush="{StaticResource TangoRippleDarkBrush}" RippleFactor="15">
+ <components:Ripple RippleBrush="{TemplateBinding RippleBrush}" RippleFactor="15">
+
<Grid>
<TextBox FontSize="{TemplateBinding FontSize}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Foreground="{TemplateBinding Foreground}" Padding="0 0 0 4" CaretBrush="{StaticResource TangoPrimaryAccentBrush}" FocusVisualStyle="{x:Null}" x:Name="PART_TextBox" BorderThickness="0" Background="Transparent">
<TextBox.Style>