From 158b8282cffedaa6e68740fce2d4d6c75d8f44c1 Mon Sep 17 00:00:00 2001
From: b_zam <b_zamir@mail.ru>
Date: Sun, 17 Mar 2019 22:43:38 +0300
Subject: [PATCH] Fix added styles

---
 src/UrhoSharp.Editor/App.xaml                 |   1 +
 src/UrhoSharp.Editor/UrhoSharp.Editor.csproj  |   5 +
 src/UrhoSharp.Editor/View/EditorWindow.xaml   |   2 +-
 .../View/EditorWindow.xaml.cs                 |  10 +-
 src/UrhoSharp.Editor/View/HierarchyView.xaml  |   2 +-
 src/UrhoSharp.Editor/View/PropertiesView.xaml |   4 +-
 src/UrhoSharp.Editor/View/Styles/Dark.xaml    |  19 ++-
 src/UrhoSharp.Editor/View/Styles/Gray.xaml    |  11 +-
 src/UrhoSharp.Editor/View/Styles/White.xaml   |  10 +-
 .../View/Styles/WinStyle/WinStyle.xaml        | 123 ++++++++++++++++++
 10 files changed, 156 insertions(+), 31 deletions(-)
 create mode 100644 src/UrhoSharp.Editor/View/Styles/WinStyle/WinStyle.xaml

diff --git a/src/UrhoSharp.Editor/App.xaml b/src/UrhoSharp.Editor/App.xaml
index bbace10..0723b21 100644
--- a/src/UrhoSharp.Editor/App.xaml
+++ b/src/UrhoSharp.Editor/App.xaml
@@ -9,6 +9,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/View/Styles/Dark.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/View/Styles/WinStyle/WinStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/UrhoSharp.Editor/UrhoSharp.Editor.csproj b/src/UrhoSharp.Editor/UrhoSharp.Editor.csproj
index ef2e629..04c43f3 100644
--- a/src/UrhoSharp.Editor/UrhoSharp.Editor.csproj
+++ b/src/UrhoSharp.Editor/UrhoSharp.Editor.csproj
@@ -274,6 +274,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Styles\WinStyle\WinStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -337,6 +341,7 @@
     <EmbeddedResource Include="Icons\unknown.png" />
     <EmbeddedResource Include="Icons\xml.png" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\UrhoSharp.1.9.67\build\net45\UrhoSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/src/UrhoSharp.Editor/View/EditorWindow.xaml b/src/UrhoSharp.Editor/View/EditorWindow.xaml
index 7f7f43f..0a4fe9a 100644
--- a/src/UrhoSharp.Editor/View/EditorWindow.xaml
+++ b/src/UrhoSharp.Editor/View/EditorWindow.xaml
@@ -30,7 +30,7 @@
                 <MenuItem Header="Styles" x:Name="MenuStyles"/>
             </MenuItem>
         </Menu>
-        <ToolBar Grid.Row="1" />
+        <ToolBar Grid.Row="1" Background="{DynamicResource MainBGcolor}"/>
         <Grid Grid.Row="2" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*" />
diff --git a/src/UrhoSharp.Editor/View/EditorWindow.xaml.cs b/src/UrhoSharp.Editor/View/EditorWindow.xaml.cs
index 5fd1f16..67af6c0 100644
--- a/src/UrhoSharp.Editor/View/EditorWindow.xaml.cs
+++ b/src/UrhoSharp.Editor/View/EditorWindow.xaml.cs
@@ -23,14 +23,16 @@ public EditorWindow()
             MenuStyles.Click += SetStyle;
         }
 
+        ResourceDictionary mainStyle = new ResourceDictionary() {Source = new Uri(@"View\Styles\WinStyle\WinStyle.xaml", UriKind.Relative) };
         private void SetStyle(object sender, RoutedEventArgs e) {
             if( e.OriginalSource is System.Windows.Controls.MenuItem mi) {
-                ResourceDictionary dir = new ResourceDictionary() {
-                    Source = new Uri(@"View\Styles\" + mi.Header.ToString()+".xaml",UriKind.Relative)
+                ResourceDictionary dir = new ResourceDictionary() { 
+                    Source = new Uri(@"View\Styles\" + mi.Header.ToString() + ".xaml", UriKind.Relative)
                 };
-
-                System.Windows.Application.Current.Resources.MergedDictionaries.Clear();
+                System.Windows.Application.Current.Resources.Clear();
+                //System.Windows.Application.Current.Resources.Remove(System.Windows.Application.Current.Resources.MergedDictionaries[0]);
                 System.Windows.Application.Current.Resources.MergedDictionaries.Add(dir);
+                System.Windows.Application.Current.Resources.MergedDictionaries.Add(mainStyle);
 
             }
             
diff --git a/src/UrhoSharp.Editor/View/HierarchyView.xaml b/src/UrhoSharp.Editor/View/HierarchyView.xaml
index 3cbafd8..d2b4be4 100644
--- a/src/UrhoSharp.Editor/View/HierarchyView.xaml
+++ b/src/UrhoSharp.Editor/View/HierarchyView.xaml
@@ -12,7 +12,7 @@
             <TreeView.Resources>
                 <HierarchicalDataTemplate DataType="{x:Type viewModel:NodeViewModel}"
                                           ItemsSource="{Binding Path=Children}">
-                    <TextBlock Text="{Binding Name}">
+                    <TextBlock Text="{Binding Name}"  Foreground="{DynamicResource FontColor}">
                         <TextBlock.ContextMenu>
                             <ContextMenu>
                                 <!--<MenuItem Header="Open Folder in File Explorer"
diff --git a/src/UrhoSharp.Editor/View/PropertiesView.xaml b/src/UrhoSharp.Editor/View/PropertiesView.xaml
index 5db85ba..6f46e2e 100644
--- a/src/UrhoSharp.Editor/View/PropertiesView.xaml
+++ b/src/UrhoSharp.Editor/View/PropertiesView.xaml
@@ -37,7 +37,7 @@
                             <ColumnDefinition Width="3px"/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="{Binding Name}"/>
+                            <TextBlock Text="{Binding Name}"  Foreground="{DynamicResource FontColor}"/>
                         <CheckBox Grid.Column="3" MinWidth="100" IsChecked="{Binding Value}" Grid.Row="{Binding Index}"  />
                     </Grid>
                 </DataTemplate>
@@ -48,7 +48,7 @@
                             <ColumnDefinition Width="3px"/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                            <TextBlock Text="{Binding Name}"/>
+                            <TextBlock Text="{Binding Name}"  Foreground="{DynamicResource FontColor}"/>
                             <TextBox  Grid.Column="2" MinWidth="100" Text="{Binding Value}" Grid.Row="{Binding Index}" />
                     </Grid>
                 </DataTemplate>
diff --git a/src/UrhoSharp.Editor/View/Styles/Dark.xaml b/src/UrhoSharp.Editor/View/Styles/Dark.xaml
index e2447fd..6c061ee 100644
--- a/src/UrhoSharp.Editor/View/Styles/Dark.xaml
+++ b/src/UrhoSharp.Editor/View/Styles/Dark.xaml
@@ -1,15 +1,12 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:UrhoSharp.Editor.View.Styles">
+<ResourceDictionary x:Name="Dark" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <SolidColorBrush x:Key="MainBGcolor" Color="Black"/>
-    <SolidColorBrush x:Key="FontColor" Color="#FFDEDFE0"/>
+    <SolidColorBrush x:Key="TittleBarcolor" Color="#FF181819"/>
+    <SolidColorBrush x:Key="MainBGcolor" Color="#FF181819"/>
+    <SolidColorBrush x:Key="FontColor" Color="#FFEDF8FF"/>
     <SolidColorBrush x:Key="StatuSBarColor" Color="#007ACC"/>
+    <SolidColorBrush x:Key="SplitterColor" Color="#FF2B3A7C"/>
+  
 
-    <Style TargetType="{x:Type GridSplitter}">
-        <Setter Property="Background" Value="#FF0C4F7C"/>
-    </Style>
-
-   
-    
+  
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/UrhoSharp.Editor/View/Styles/Gray.xaml b/src/UrhoSharp.Editor/View/Styles/Gray.xaml
index 4c7052b..3c3979d 100644
--- a/src/UrhoSharp.Editor/View/Styles/Gray.xaml
+++ b/src/UrhoSharp.Editor/View/Styles/Gray.xaml
@@ -1,13 +1,12 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:UrhoSharp.Editor.View.Styles">
+<ResourceDictionary  x:Name="Gray" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <SolidColorBrush x:Key="TittleBarcolor" Color="#FF181819"/>
     <SolidColorBrush x:Key="MainBGcolor" Color="Gray"/>
     <SolidColorBrush x:Key="FontColor" Color="DarkBlue"/>
     <SolidColorBrush x:Key="StatuSBarColor" Color="Black"/>
+    <SolidColorBrush x:Key="SplitterColor" Color="Black"/>
+
 
-    <Style TargetType="{x:Type GridSplitter}">
-        <Setter Property="Background" Value="Black"/>
-    </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/UrhoSharp.Editor/View/Styles/White.xaml b/src/UrhoSharp.Editor/View/Styles/White.xaml
index e3a6859..3af8ea5 100644
--- a/src/UrhoSharp.Editor/View/Styles/White.xaml
+++ b/src/UrhoSharp.Editor/View/Styles/White.xaml
@@ -1,13 +1,11 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:UrhoSharp.Editor.View.Styles">
+<ResourceDictionary x:Name="White" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <SolidColorBrush x:Key="TittleBarcolor" Color="#FF181819"/>
     <SolidColorBrush x:Key="MainBGcolor" Color="White"/>
     <SolidColorBrush x:Key="FontColor" Color="Black"/>
     <SolidColorBrush x:Key="StatuSBarColor" Color="Gray"/>
+    <SolidColorBrush x:Key="SplitterColor" Color="Black"/>
 
-    <Style TargetType="{x:Type GridSplitter}">
-        <Setter Property="Background" Value="Black"/>
 
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/UrhoSharp.Editor/View/Styles/WinStyle/WinStyle.xaml b/src/UrhoSharp.Editor/View/Styles/WinStyle/WinStyle.xaml
new file mode 100644
index 0000000..9759a10
--- /dev/null
+++ b/src/UrhoSharp.Editor/View/Styles/WinStyle/WinStyle.xaml
@@ -0,0 +1,123 @@
+<ResourceDictionary 
+    x:Class="WinStyles.DarkdWindow.DarkStyle"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+    <Style TargetType="{x:Type MenuItem}">
+        <Setter Property="Foreground" Value="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type MenuItem}">
+                    <Border x:Name="Border"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition x:Name="Col0" MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup"/>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuTextColumnGroup"/>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup"/>
+                                <ColumnDefinition x:Name="Col3" Width="14"/>
+                            </Grid.ColumnDefinitions>
+
+                            <ContentPresenter Grid.Column="0" Margin="4,0,6,0" x:Name="Icon" VerticalAlignment="Center" ContentSource="Icon"/>
+
+                            <Grid Grid.Column="0" Visibility="Hidden" Margin="4,0,6,0" x:Name="GlyphPanel" VerticalAlignment="Center">
+                                <Path x:Name="GlyphPanelpath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,2 L0,4.8 L2.5,7.4 L7.1,2.8 L7.1,0 L2.5,4.6 z" FlowDirection="LeftToRight"/>
+                            </Grid>
+
+                            <ContentPresenter Grid.Column="1" Margin="{TemplateBinding Padding}"
+                                          x:Name="HeaderHost" RecognizesAccessKey="True"
+                                          ContentSource="Header"/>
+
+                            <ContentPresenter Grid.Column="2" Margin="8,1,8,1"
+                                          x:Name="IGTHost" ContentSource="InputGestureText"
+                                          VerticalAlignment="Center"/>
+
+                            <Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
+                                <Path x:Name="ArrowPanelPath" HorizontalAlignment="Right" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z"/>
+                            </Grid>
+
+                            <Popup IsOpen="{Binding Path=IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" x:Name="SubMenuPopup" Focusable="false" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
+                                <Border x:Name="SubMenuBorder" BorderBrush="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}" BorderThickness="1" Padding="2,2,2,2">
+                                    <Grid x:Name="SubMenu" Grid.IsSharedSizeScope="True">
+                                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                                    </Grid>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Role" Value="TopLevelHeader">
+                            <Setter Property="Padding" Value="6,1,6,1"/>
+                            <Setter Property="Placement" Value="Bottom" TargetName="SubMenuPopup"/>
+                            <Setter Property="MinWidth" Value="0" TargetName="Col0"/>
+                            <Setter Property="Width" Value="Auto" TargetName="Col3"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="GlyphPanel"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="IGTHost"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel"/>
+                        </Trigger>
+
+                        <Trigger Property="Role" Value="TopLevelItem">
+                            <Setter Property="Padding" Value="6,1,6,1"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel"/>
+                        </Trigger>
+
+                        <Trigger Property="Role" Value="SubmenuHeader">
+                            <Setter Property="DockPanel.Dock" Value="Top"/>
+                            <Setter Property="Padding" Value="0,2,0,2"/>
+                        </Trigger>
+
+                        <Trigger Property="Role" Value="SubmenuItem">
+                            <Setter Property="DockPanel.Dock" Value="Top"/>
+                            <Setter Property="Padding" Value="0,2,0,2"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel"/>
+                        </Trigger>
+                        <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+                            <Setter Property="PopupAnimation" Value="None" TargetName="SubMenuPopup"/>
+                        </Trigger>
+
+                        <Trigger Property="Icon" Value="{x:Null}">
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
+                        </Trigger>
+
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="GlyphPanel"/>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
+                        </Trigger>
+
+                        <Trigger Property="IsHighlighted" Value="true">
+                            <Setter Property="Background" Value="#FF606680" TargetName="Border"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="LightGray"/>
+                        </Trigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type Menu}">
+        <Setter Property="Background" Value="{DynamicResource TittleBarcolor}"/>
+        <Setter Property="Foreground" Value="White"/>
+    </Style>
+
+    <Style TargetType="{x:Type GridSplitter}">
+        <Setter Property="Background" Value="{DynamicResource SplitterColor}"/>
+    </Style>
+
+    <!--<Style TargetType="{x:Type TextBlock}">
+        <Setter Property="Background" Value="{DynamicResource MainBGcolor}"/>
+        <Setter Property="Foreground" Value="{DynamicResource FontColor}"/>
+    </Style>-->
+
+
+</ResourceDictionary>
\ No newline at end of file