Merge pull request #27 from ghost1372/MergeResources/Part1

Merge resources/part1
iNKORE-NET · Dec 1, 2023 · 18e608e · 18e608e
2 parents ccbbe4b + 8e7e102
commit 18e608e
Show file tree

Hide file tree

Showing 58 changed files with 9,407 additions and 617 deletions.
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.xaml b/source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.xaml
@@ -1,18 +1,10 @@
 <ResourceDictionary
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
- xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
- xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
- xmlns:sys="clr-namespace:System;assembly=mscorlib"
  xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
- xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
- <ResourceDictionary.MergedDictionaries>
- <ResourceDictionary>
- <local:BrushTranslationConverter x:Key="BrushTranslationConverter" />
- <converters:ColorToBrushConverter x:Key="ColorToSolidColorBrushConverter" />
- </ResourceDictionary>
- </ResourceDictionary.MergedDictionaries>
+ xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
+ xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls">
+ <converters:ColorToBrushConverter x:Key="ColorToSolidColorBrushConverter" />
 
  <Style x:Key="AcrylicContentControlStyle" TargetType="ContentControl">
  <Setter Property="IsTabStop" Value="False" />
@@ -28,11 +20,14 @@
  <Border
  x:Name="TintColorLayer"
  Background="{TemplateBinding local:AcrylicElement.TintColor,
- Converter={StaticResource ColorToSolidColorBrushConverter}}"
- Opacity="{TemplateBinding local:AcrylicElement.TintOpacity}" 
- CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"/>
+  Converter={StaticResource ColorToSolidColorBrushConverter}}"
+ CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+ Opacity="{TemplateBinding local:AcrylicElement.TintOpacity}" />
  <!-- Tiled noise texture -->
- <Border x:Name="NoiseLayer" Opacity="{TemplateBinding local:AcrylicElement.NoiseOpacity}" CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+ <Border
+ x:Name="NoiseLayer"
+ CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+ Opacity="{TemplateBinding local:AcrylicElement.NoiseOpacity}">
  <Border.Background>
  <ImageBrush
  ImageSource="/iNKORE.UI.WPF.Modern;component/Resources/Images/NoiseAsset_256X256_PNG.png"
@@ -81,12 +76,13 @@
  <ContentControl chelper:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}">
  <ContentControl.Template>
  <ControlTemplate TargetType="ContentControl">
- <Border Background="{TemplateBinding Background}"
+ <Border
+ Padding="{TemplateBinding Padding}"
+ Background="{TemplateBinding Background}"
  BorderBrush="{TemplateBinding BorderBrush}"
- BorderThickness="{TemplateBinding BorderThickness}"
- Padding="{TemplateBinding Padding}">
+ BorderThickness="{TemplateBinding BorderThickness}">
  <AdornerDecorator>
- <ContentPresenter/>
+ <ContentPresenter />
  </AdornerDecorator>
  </Border>
  </ControlTemplate>
@@ -95,18 +91,18 @@
  <BitmapCache RenderAtScale="0.2" />
  </ContentControl.CacheMode>
  <Border
- x:Name="Rect"
- Width="{Binding Target.ActualWidth, RelativeSource={RelativeSource Mode=TemplatedParent}}"
- Height="{Binding Target.ActualHeight, RelativeSource={RelativeSource Mode=TemplatedParent}}"
- ClipToBounds="False"
- IsHitTestVisible="False">
+  x:Name="Rect"
+  Width="{Binding Target.ActualWidth, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+  Height="{Binding Target.ActualHeight, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+  ClipToBounds="False"
+  IsHitTestVisible="False">
  <Border.Background>
  <VisualBrush
- AlignmentX="Left"
- AlignmentY="Top"
- Stretch="None"
- ViewboxUnits="Absolute"
- Visual="{Binding Target, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+  AlignmentX="Left"
+  AlignmentY="Top"
+  Stretch="None"
+  ViewboxUnits="Absolute"
+  Visual="{Binding Target, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
  </Border.Background>
  <Border.RenderTransform>
  <MultiBinding Converter="{StaticResource BrushTranslationConverter}">
@@ -123,7 +119,7 @@
 
  </local:ClippingBorder>
 
- <ContentControl Style="{StaticResource AcrylicContentControlStyle}" chelper:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}">
+ <ContentControl chelper:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}" Style="{StaticResource AcrylicContentControlStyle}">
  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
  </ContentControl>
  </Grid>

diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Primitives/TitleBarButton.xaml b/source/iNKORE.UI.WPF.Modern/Controls/Primitives/TitleBarButton.xaml
@@ -1,12 +1,7 @@
 <ResourceDictionary
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
- xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
- xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
- xmlns:sys="clr-namespace:System;assembly=mscorlib"
- xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
- xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
+ xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives">
 
  <Style TargetType="primitives:TitleBarButton">
  <Setter Property="Background" Value="{DynamicResource TitleBarButtonBackground}" />

diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Primitives/TitleBarControl.xaml b/source/iNKORE.UI.WPF.Modern/Controls/Primitives/TitleBarControl.xaml
@@ -3,10 +3,7 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
  xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
- xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
- xmlns:sys="clr-namespace:System;assembly=mscorlib"
- xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
- xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
+ xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
  <sys:Double x:Key="{x:Static primitives:TitleBar.HeightKey}">32</sys:Double>
 
@@ -103,14 +100,14 @@
 
  <primitives:TitleBarButton
  x:Name="MaximizeRestoreButton"
+ Height="{Binding ElementName=PART_RightSystemOverlay, Path=ActualHeight}"
  AutomationProperties.Name="Maximize"
  Command="{x:Static SystemCommands.MaximizeWindowCommand}"
  Content="{StaticResource ChromeMaximize}"
  ContentTemplate="{StaticResource IconTemplate}"
  IsActive="{TemplateBinding IsActive}"
  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
- Style="{TemplateBinding ButtonStyle}"
- Height="{Binding ElementName=PART_RightSystemOverlay, Path=ActualHeight}"/>
+ Style="{TemplateBinding ButtonStyle}" />
 
  <primitives:TitleBarButton
  x:Name="CloseButton"

diff --git a/source/iNKORE.UI.WPF.Modern/Controls/XamlControlsResources.cs b/source/iNKORE.UI.WPF.Modern/Controls/XamlControlsResources.cs
@@ -13,7 +13,6 @@ public class XamlControlsResources : ResourceDictionary
  /// </summary>
  public XamlControlsResources()
  {
- MergedDictionaries.Add(ThemeResources);
  MergedDictionaries.Add(ControlsResources);
  MergedDictionaries.Add(UISettingsResources);
 
@@ -55,25 +54,13 @@ public bool UseCompactResources
  }
  }
 
- internal static ResourceDictionary ThemeResources
- {
- get
- {
- if (_themeResources == null)
- {
- _themeResources = new ResourceDictionary { Source = PackUriHelper.GetAbsoluteUri("Themes/ThemeResources.xaml") };
- }
- return _themeResources;
- }
- }
-
  internal static ResourceDictionary ControlsResources
  {
  get
  {
  if (_controlsResources == null)
  {
- _controlsResources = new ResourceDictionary { Source = PackUriHelper.GetAbsoluteUri("Themes/ControlsResources.xaml") };
+ _controlsResources = new ResourceDictionary { Source = PackUriHelper.GetAbsoluteUri("Themes/CombinedResources.xaml") };
  }
  return _controlsResources;
  }
@@ -99,7 +86,6 @@ internal static ResourceDictionary UISettingsResources
  }
  }
 
- private static ResourceDictionary _themeResources;
  private static ResourceDictionary _controlsResources;
  private static ResourceDictionary _compactResources;
  private static ResourceDictionary _uiSettingsResources;