86288

Kinnara · Jul 30, 2013 · 6aff65b · 6aff65b
1 parent 6683fba
commit 6aff65b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 9 deletions.
diff --git a/Microsoft.Phone.Controls.Toolkit.WP7/Themes/Generic.xaml b/Microsoft.Phone.Controls.Toolkit.WP7/Themes/Generic.xaml
@@ -510,6 +510,7 @@
 
     <Style TargetType="controls:DatePicker">
         <Setter Property="Background" Value="{StaticResource PhoneTextBoxBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource PhoneForegroundBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Foreground" Value="{StaticResource PhoneTextBoxForegroundBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -530,6 +531,7 @@
                             x:Name="DateTimeButton"
                             Content="{TemplateBinding ValueString}"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             FontFamily="{TemplateBinding FontFamily}"
                             Foreground="{TemplateBinding Foreground}"
@@ -543,6 +545,7 @@
 
     <Style TargetType="controls:TimePicker">
         <Setter Property="Background" Value="{StaticResource PhoneTextBoxBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource PhoneForegroundBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Foreground" Value="{StaticResource PhoneTextBoxForegroundBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -565,6 +568,7 @@
                             x:Name="DateTimeButton"
                             Content="{TemplateBinding ValueString}"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             FontFamily="{TemplateBinding FontFamily}"
                             Foreground="{TemplateBinding Foreground}"

diff --git a/Microsoft.Phone.Controls.Toolkit.WP8/DateTimePickers/DatePickerPage.xaml.cs b/Microsoft.Phone.Controls.Toolkit.WP8/DateTimePickers/DatePickerPage.xaml.cs
@@ -73,7 +73,7 @@ protected override void OnOrientationChanged(OrientationChangedEventArgs e)
         /// Sets the selectors and title flow direction.
         /// </summary>
         /// <param name="flowDirection">Flow direction to set.</param>
-        internal override void SetFlowDirection(FlowDirection flowDirection)
+        public override void SetFlowDirection(FlowDirection flowDirection)
         {
             HeaderTitle.FlowDirection = flowDirection;
 

diff --git a/Microsoft.Phone.Controls.Toolkit.WP8/DateTimePickers/TimePickerPage.xaml.cs b/Microsoft.Phone.Controls.Toolkit.WP8/DateTimePickers/TimePickerPage.xaml.cs
@@ -76,7 +76,7 @@ protected override void OnOrientationChanged(OrientationChangedEventArgs e)
         /// Sets the selectors and title flow direction.
         /// </summary>
         /// <param name="flowDirection">Flow direction to set.</param>
-        internal override void SetFlowDirection(FlowDirection flowDirection)
+        public override void SetFlowDirection(FlowDirection flowDirection)
         {
             HeaderTitle.FlowDirection = flowDirection;
 

diff --git a/Microsoft.Phone.Controls.Toolkit.WP8/Themes/Generic.xaml b/Microsoft.Phone.Controls.Toolkit.WP8/Themes/Generic.xaml
@@ -505,6 +505,7 @@
 
     <Style TargetType="controls:DatePicker">
         <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="{StaticResource PhoneForegroundBrush}"/>
         <Setter Property="BorderThickness" Value="{StaticResource PhoneBorderThickness}"/>
         <Setter Property="Foreground" Value="{StaticResource PhoneForegroundBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -525,6 +526,7 @@
                             x:Name="DateTimeButton"
                             Content="{TemplateBinding ValueString}"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             FontFamily="{TemplateBinding FontFamily}"
                             Foreground="{TemplateBinding Foreground}"
@@ -538,6 +540,7 @@
 
     <Style TargetType="controls:TimePicker">
         <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="{StaticResource PhoneForegroundBrush}"/>
         <Setter Property="BorderThickness" Value="{StaticResource PhoneBorderThickness}"/>
         <Setter Property="Foreground" Value="{StaticResource PhoneForegroundBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -560,6 +563,7 @@
                             x:Name="DateTimeButton"
                             Content="{TemplateBinding ValueString}"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             FontFamily="{TemplateBinding FontFamily}"
                             Foreground="{TemplateBinding Foreground}"

diff --git a/Microsoft.Phone.Controls.Toolkit/DateTimePickers/DatePickerPage.xaml.cs b/Microsoft.Phone.Controls.Toolkit/DateTimePickers/DatePickerPage.xaml.cs
@@ -73,7 +73,7 @@ protected override void OnOrientationChanged(OrientationChangedEventArgs e)
         /// Sets the selectors and title flow direction.
         /// </summary>
         /// <param name="flowDirection">Flow direction to set.</param>
-        internal override void SetFlowDirection(FlowDirection flowDirection)
+        public override void SetFlowDirection(FlowDirection flowDirection)
         {
             HeaderTitle.FlowDirection = flowDirection;
 

diff --git a/Microsoft.Phone.Controls.Toolkit/DateTimePickers/DateTimePickerBase.cs b/Microsoft.Phone.Controls.Toolkit/DateTimePickers/DateTimePickerBase.cs
@@ -301,14 +301,14 @@ private void OnFrameNavigated(object sender, NavigationEventArgs e)
             else if (null == _dateTimePickerPage)
             {
                 // Navigation to a new page; capture it and push the value in
-                var page = e.Content as DateTimePickerPageBase;
+                var pickerPage = e.Content as IDateTimePickerPage;
 
-                if (null != page)
+                if (null != pickerPage)
                 {
-                    _dateTimePickerPage = page;
+                    _dateTimePickerPage = pickerPage;
                     _dateTimePickerPage.Value = Value.GetValueOrDefault(DateTime.Now);
 
-                    page.SetFlowDirection(this.FlowDirection);
+                    pickerPage.SetFlowDirection(this.FlowDirection);
                 }
             }
         }

diff --git a/Microsoft.Phone.Controls.Toolkit/DateTimePickers/DateTimePickerPageBase.cs b/Microsoft.Phone.Controls.Toolkit/DateTimePickers/DateTimePickerPageBase.cs
@@ -306,6 +306,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         /// Sets the selectors and title flow direction.
         /// </summary>
         /// <param name="flowDirection">Flow direction to set.</param>
-        internal abstract void SetFlowDirection(FlowDirection flowDirection);
+        public abstract void SetFlowDirection(FlowDirection flowDirection);
     }
 }
diff --git a/Microsoft.Phone.Controls.Toolkit/DateTimePickers/IDateTimePickerPage.cs b/Microsoft.Phone.Controls.Toolkit/DateTimePickers/IDateTimePickerPage.cs
@@ -4,6 +4,7 @@
 // All other rights reserved.
 
 using System;
+using System.Windows;
 
 namespace Microsoft.Phone.Controls.Primitives
 {
@@ -16,5 +17,11 @@ public interface IDateTimePickerPage
         /// Gets or sets the DateTime to show in the picker page and to set when the user makes a selection.
         /// </summary>
         DateTime? Value { get; set; }
+
+        /// <summary>
+        /// Sets the flow direction on any children controls that need it.
+        /// </summary>
+        /// <param name="flowDirection">Flow direction to set.</param>
+        void SetFlowDirection(FlowDirection flowDirection);
     }
 }
diff --git a/Microsoft.Phone.Controls.Toolkit/DateTimePickers/TimePickerPage.xaml.cs b/Microsoft.Phone.Controls.Toolkit/DateTimePickers/TimePickerPage.xaml.cs
@@ -76,7 +76,7 @@ protected override void OnOrientationChanged(OrientationChangedEventArgs e)
         /// Sets the selectors and title flow direction.
         /// </summary>
         /// <param name="flowDirection">Flow direction to set.</param>
-        internal override void SetFlowDirection(FlowDirection flowDirection)
+        public override void SetFlowDirection(FlowDirection flowDirection)
         {
             HeaderTitle.FlowDirection = flowDirection;