From c2316ec58381f2e8e4d87d4bdf9112c5bd9415be Mon Sep 17 00:00:00 2001
From: Vsevolod Kukol <sevoku@xamarin.com>
Date: Wed, 16 Dec 2015 16:47:39 +0100
Subject: [Windows] Different style colors for titlebar menu

---
 main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs  |  8 +++++++-
 .../src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml | 14 +++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs
index 99890053a3..f983b07de6 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs
@@ -39,6 +39,9 @@ namespace WindowsPlatform
 		public static Brush MainToolbarButtonPressedBackgroundBrush { get; private set; }
 		public static Brush MainToolbarButtonPressedBorderBrush { get; private set; }
 
+		public static Brush MenuBarBackgroundBrush { get; private set; }
+		public static Brush MenuBarForegroundBrush { get; private set; }
+		public static Brush MenuBarBorderBrush { get; private set; }
 		public static Brush MenuBackgroundBrush { get; private set; }
 		public static Brush MenuForegroundBrush { get; private set; }
 		public static Brush MenuBorderBrush { get; private set; }
@@ -70,7 +73,10 @@ namespace WindowsPlatform
 			MainToolbarButtonPressedBackgroundBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
 			MainToolbarButtonPressedBorderBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
 
-			MenuBackgroundBrush = SystemColors.MenuBarBrush;
+			MenuBarBackgroundBrush = SystemColors.MenuBarBrush;
+			MenuBarForegroundBrush = SystemColors.MenuTextBrush;
+			MenuBarBorderBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x99, G = 0x99, B = 0x99 });
+			MenuBackgroundBrush = Brushes.White;
 			MenuForegroundBrush = SystemColors.MenuTextBrush;
 			MenuBorderBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x99, G = 0x99, B = 0x99 });
 			MenuSeparatorBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0xD7, G = 0xD7, B = 0xD7 });
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml
index 21d376ca95..e6c7fa9141 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml
@@ -36,12 +36,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Menu}">
                     <Border 
-                        Background="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"
-                        BorderBrush="{Binding Path=(platform:Styles.MenuBorderBrush), Mode=OneWay}"
+                        Background="{Binding Path=(platform:Styles.MenuBarBackgroundBrush), Mode=OneWay}"
+                        BorderBrush="{Binding Path=(platform:Styles.MenuBarBorderBrush), Mode=OneWay}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         Padding="{TemplateBinding Padding}" 
                         SnapsToDevicePixels="true"
-            			TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">
+            			TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">
                         <ItemsPresenter 
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
@@ -157,7 +157,7 @@
             BorderThickness="{TemplateBinding BorderThickness}"
             Background="Transparent"
             BorderBrush="Transparent"
-            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">
+            TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">
             <Grid VerticalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
@@ -177,7 +177,7 @@
                     Margin="3"
                     Visibility="Collapsed"
                     VerticalAlignment="Center"
-                    Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />
+                    Fill="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}" />
                 <ContentPresenter
                     Grid.Column="1"
                     ContentSource="Header"
@@ -211,7 +211,7 @@
             BorderThickness="{TemplateBinding BorderThickness}"
             Background="Transparent"
             BorderBrush="Transparent"
-            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">
+            TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">
             <Grid VerticalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
@@ -231,7 +231,7 @@
                     Margin="3"
                     Visibility="Collapsed"
                     VerticalAlignment="Center"
-                    Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />
+                    Fill="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}" />
                 <ContentPresenter
                     Grid.Column="1"
                     ContentSource="Header"
-- 
cgit v1.2.3