UI changes, code clone, xml merge

Integrated XamlDictionaryMergeTool merge for better xaml handling
Several UI changes
Code cleanup

Author: Codectory

Source/AutoHDR/App.xaml

@@ -251,21 +251,21 @@
     <Compile Include="UWP\AppxManifest.cs" />
     <Compile Include="UWP\UWPAppsManager.cs" />
     <Compile Include="UWP\UWPApp.cs" />
-    <Page Include="Controls\Colors.xaml">
+    <Page Include="Controls\1_Colors.xaml">
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="Controls\ControlProperties.xaml">
+    <Page Include="Controls\AppResources.xaml">
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\CustomComboBox.xaml">
+    <Page Include="Controls\2_DefaultControls.xaml">
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="Controls\DefaultBorder.xaml">
+    <Page Include="Controls\3_CustomComboBox.xaml">
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
     <Page Include="Theming\LightColors.xaml">
       <SubType>Designer</SubType>
@@ -436,4 +436,8 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>$(SolutionDir)\BuildTools\XamlDictionaryMergeTool\XamlDictionaryMergeTool.exe "$(ProjectDir)Controls" "$(ProjectDir)Controls\AppResources.xaml"
+</PreBuildEvent>
+  </PropertyGroup>
 </Project>

Source/AutoHDR/AutoHDR.csproj

@@ -12,7 +12,7 @@
     <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
     <Color x:Key="GlyphColor">#FF444444</Color>
     <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
-    <Color x:Key="DisabledControlDarkColor">#8a8a8a</Color>
+    <Color x:Key="DisabledControlDarkColor">#8A8A8A</Color>
 
     <Color x:Key="DisabledBorderColor">#adadad</Color>
     <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/>

Source/AutoHDR/Controls/Colors.xaml renamed to Source/AutoHDR/Controls/1_Colors.xaml

@@ -57,6 +57,8 @@
         <Setter Property="MinWidth" Value="120"/>
         <Setter Property="MinHeight" Value="20"/>
         <Setter Property="Foreground" Value="Black"/>
+		<Setter Property="FontWeight" Value="DemiBold"/>
+		<Setter Property="FontSize" Value="{StaticResource DefaultFontSize}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
@@ -75,8 +77,7 @@
                             Margin="5,3,23,3"
                             VerticalAlignment="Center"
                             HorizontalAlignment="Left" />
-                        <TextBox x:Name="PART_EditableTextBox"
-                            Style="{x:Null}" 
+                        <TextBox x:Name="PART_EditableTextBox" Style="{StaticResource DefaultTextBox}"
                             Template="{StaticResource ComboBoxTextBox}" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Center" 
@@ -111,14 +112,14 @@
                             <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{StaticResource DisabledControlDarkColor}"/>
+                            <Setter Property="Foreground" Value="{StaticResource DisabledAccentBrush}"/>
                         </Trigger>
                         <Trigger Property="IsGrouping" Value="true">
                             <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
                         </Trigger>
                         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="true">
-                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0"/>
                             <Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0"/>
+
                         </Trigger>
                         <Trigger Property="IsEditable"  Value="true">
                             <Setter Property="IsTabStop" Value="false"/>
@@ -140,11 +141,12 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Border Name="Border"
-                              Padding="2"
+                    <Grid>
+                    <Border Name="Border" Style="{StaticResource DefaultBorder}" BorderThickness="0"                              
                               SnapsToDevicePixels="true">
-                        <ContentPresenter />
                     </Border>
+                        <ContentPresenter />
+                    </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsHighlighted" Value="true">
                             <Setter TargetName="Border" Property="Background" Value="{StaticResource MouseOverBrush}"/>