Working on PPC.

2 files changed, 16 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Styles/TouchButton.xaml b/Software/Visual_Studio/Tango.Touch/Styles/TouchButton.xaml
index e62404309..fea5c541c 100644
--- a/Software/Visual_Studio/Tango.Touch/Styles/TouchButton.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Styles/TouchButton.xaml
@@ -26,13 +26,24 @@
         <Setter Property="RippleFactor" Value="10"></Setter>
     </Style>
 
-    <Style x:Key="TangoHollowButton" TargetType="{x:Type controls:TouchButton}">
+    <Style x:Key="TangoLinkButton" TargetType="{x:Type controls:TouchButton}">
         <Setter Property="Background" Value="Transparent"></Setter>
         <Setter Property="CornerRadius" Value="20"></Setter>
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="EnableDropShadow" Value="False"></Setter>
+        <Setter Property="Padding" Value="10 5"></Setter>
+        <Setter Property="RippleBrush" Value="{StaticResource TangoRippleDarkBrush}"></Setter>
+        <Setter Property="FontSize" Value="{StaticResource TangoDefaultFontSize}"></Setter>
+    </Style>
+
+    <Style x:Key="TangoHollowButton" TargetType="{x:Type controls:TouchButton}">
+        <Setter Property="Background" Value="Transparent"></Setter>
+        <Setter Property="CornerRadius" Value="30"></Setter>
         <Setter Property="TextElement.Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-        <Setter Property="BorderThickness" Value="1"></Setter>
+        <Setter Property="BorderThickness" Value="2"></Setter>
         <Setter Property="BorderBrush" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
         <Setter Property="RippleBrush" Value="{StaticResource TangoRippleDarkBrush}"></Setter>
+        <Setter Property="EnableDropShadow" Value="False"></Setter>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Styles/TouchListBox.xaml b/Software/Visual_Studio/Tango.Touch/Styles/TouchListBox.xaml
index dece0f8ba..ccfbc6feb 100644
--- a/Software/Visual_Studio/Tango.Touch/Styles/TouchListBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Styles/TouchListBox.xaml
@@ -11,14 +11,14 @@
 
     <localConverters:SelectionModesToBooleanConverter x:Key="SelectionModesToBooleanConverter" />
 
-    <Style x:Key="TangoBasicListBox" TargetType="{x:Type local:TouchListBox}">
-        <Setter Property="IsManipulationEnabled" Value="True"></Setter>
+    <Style x:Key="TangoNoRippleListBox" TargetType="{x:Type local:TouchListBox}">
         <Setter Property="local:TouchPanel.PreventFocusSteal" Value="True"></Setter>
+        <Setter Property="DisableScrolling" Value="True"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:TouchListBox}">
                     <Border  BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <local:LightTouchScrollViewer x:Name="PART_ScrollViewer">
+                        <local:LightTouchScrollViewer x:Name="PART_ScrollViewer" DisableScrolling="{TemplateBinding DisableScrolling}">
                             <ItemsControl VirtualizingPanel.IsVirtualizing="False" x:Name="PART_ItemsControl" Style="{x:Null}" ItemsSource="{TemplateBinding ItemsSource}" VerticalAlignment="Top" ClipToBounds="True">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>