Ruben пре 3 година
родитељ
комит
31850f2599

+ 2 - 3
PicView/PicView.csproj

@@ -155,6 +155,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     <AppDesigner Include="Properties\" />
+    <None Remove="Themes\Resources\img\noisy-texture-100x100-o3-d26-c-fcfcfc-t0.png" />
+    <Resource Include="Themes\Resources\img\noisy-texture-100x100-o3-d26-c-fcfcfc-t0.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -172,9 +174,6 @@
     <Resource Include="Themes\Resources\fonts\texgyreheros-italic.otf" />
     <Resource Include="Themes\Resources\fonts\texgyreheros-regular.otf" />
     <Resource Include="Themes\Resources\img\logo.png" />
-    <Resource Include="Themes\Resources\img\noisy-texture-100x100-o4-d13-c-fafafa-t0.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Themes\Resources\img\noisy-texture-200x200-o4-d31-c-161616-t0.png" />
   </ItemGroup>
   <ItemGroup>

BIN
PicView/Themes/Resources/img/noisy-texture-100x100-o3-d26-c-fcfcfc-t0.png


BIN
PicView/Themes/Resources/img/noisy-texture-100x100-o4-d13-c-fafafa-t0.png


+ 2 - 3
PicView/Themes/Styles/ColorThemes/Dark.xaml

@@ -61,9 +61,6 @@
         Viewport="0,0,100,100"
         ViewportUnits="Absolute" />
 
-
-
-
     <!--  Background Color  -->
     <Color x:Key="BackgroundColor">#FF2e2e2e</Color>
     <SolidColorBrush x:Key="BackgroundColorBrush" Color="{StaticResource BackgroundColor}" />
@@ -97,4 +94,6 @@
         G="75"
         R="75" />
     <SolidColorBrush x:Key="BackgroundHoverHighlightBrush" Color="{StaticResource BackgroundHoverHighlight}" />
+
+
 </ResourceDictionary>

+ 46 - 42
PicView/Themes/Styles/ColorThemes/Light.xaml

@@ -1,9 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!--  Window Border Color  -->
-    <Color x:Key="WindowBorderColor">#FF3A3A3A</Color>
-    <SolidColorBrush x:Key="WindowBorderColorBrush" Color="{DynamicResource WindowBorderColor}" />
-
     <!--  Chosen Color  -->
     <Color x:Key="ChosenColor">#F236BBFF</Color>
     <SolidColorBrush x:Key="ChosenColorBrush" Color="{DynamicResource ChosenColor}" />
@@ -21,21 +17,62 @@
     <SolidColorBrush x:Key="MainColorFadedBrush" Color="{StaticResource MainColorFaded}" />
 
     <!--  Fade Color  -->
-    <Color x:Key="FadeColor">#FFF7F4F4</Color>
+    <Color x:Key="FadeColor">#81FBF8F8</Color>
     <SolidColorBrush x:Key="FadeColorBrush" Color="{StaticResource FadeColor}" />
 
+    <!--  Subtle Fade Color  -->
+    <Color x:Key="SubtleFadeColor">#F2FEFEFE</Color>
+    <SolidColorBrush x:Key="SubtleFadeBrush" Color="{StaticResource SubtleFadeColor}" />
+
+    <!--  Border Brush  -->
+    <Color x:Key="BorderColor">#78AEAEAE</Color>
+    <Color x:Key="BorderColorAlt">DarkGray</Color>
+    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}" />
+    <SolidColorBrush x:Key="BorderBrushAlt" Color="{StaticResource BorderColorAlt}" />
+
+    <!--  Alt Interface  -->
+    <Color x:Key="AltInterface">#A7222222</Color>
+    <Color x:Key="AltInterfaceW">#A72e2c2c</Color>
+    <SolidColorBrush x:Key="AltInterfaceBrush" Color="{StaticResource AltInterface}" />
+    <SolidColorBrush x:Key="AltInterfaceWBrush" Color="{StaticResource AltInterfaceW}" />
+
+    <!--  Shadows  -->
+    <DropShadowEffect
+        x:Key="MenuShadow"
+        BlurRadius="5"
+        Direction="85"
+        ShadowDepth="3"
+        Color="#2B3E392D" />
+
+    <DropShadowEffect
+        x:Key="MenuShadowButtonBorder"
+        BlurRadius="7"
+        Direction="358"
+        RenderingBias="Quality"
+        ShadowDepth="1"
+        Color="#3F000000" />
+
+    <!--  Texture  -->
+    <ImageBrush
+        x:Key="NoisyBg"
+        ImageSource="\Themes\Resources\img\noisy-texture-100x100-o3-d26-c-fcfcfc-t0.png"
+        Opacity=".95"
+        TileMode="FlipXY"
+        Viewport="0,0,100,100"
+        ViewportUnits="Absolute" />
+
     <!--  Background Color  -->
     <Color x:Key="BackgroundColor">#fff</Color>
     <SolidColorBrush x:Key="BackgroundColorBrush" Color="{StaticResource BackgroundColor}" />
 
-    <!--  Window Background Color  -->
-    <Color x:Key="WindowBackgroundColor">#fff</Color>
-    <SolidColorBrush x:Key="WindowBackgroundColorBrush" Color="{StaticResource WindowBackgroundColor}" />
-
     <!--  Background Color Alt  -->
     <Color x:Key="BackgroundColorAlt">#fff</Color>
     <SolidColorBrush x:Key="BackgroundColorBrushAlt" Color="{StaticResource BackgroundColorAlt}" />
 
+    <!--  Window Background Color  -->
+    <Color x:Key="WindowBackgroundColor">#fff</Color>
+    <SolidColorBrush x:Key="WindowBackgroundColorBrush" Color="{StaticResource WindowBackgroundColor}" />
+
     <!--  Background Color Fade  -->
     <Color x:Key="BackgroundColorFade">#99F5F5F5</Color>
     <SolidColorBrush x:Key="BackgroundColorBrushFade" Color="{StaticResource BackgroundColorFade}" />
@@ -57,38 +94,5 @@
         R="210" />
     <SolidColorBrush x:Key="BackgroundHoverHighlightBrush" Color="{StaticResource BackgroundHoverHighlight}" />
 
-    <!--  Border Brush  -->
-    <Color x:Key="BorderColor">#dbd7ca</Color>
-    <Color x:Key="BorderColorAlt">#FFF3F3EF</Color>
-    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}" />
-    <SolidColorBrush x:Key="BorderBrushAlt" Color="{StaticResource BorderColorAlt}" />
 
-    <!--  Alt Interface  -->
-    <Color x:Key="AltInterface">#F2FFFFFF</Color>
-    <Color x:Key="AltInterfaceW">#F2EEEEEE</Color>
-    <SolidColorBrush x:Key="AltInterfaceBrush" Color="{StaticResource AltInterface}" />
-    <SolidColorBrush x:Key="AltInterfaceWBrush" Color="{StaticResource AltInterfaceW}" />
-
-    <!--  Shadows  -->
-    <DropShadowEffect
-        x:Key="MenuShadow"
-        BlurRadius="2"
-        Direction="85"
-        ShadowDepth="2"
-        Color="#33F1EEE7" />
-
-    <DropShadowEffect
-        x:Key="MenuShadowButtonBorder"
-        BlurRadius="5"
-        Direction="355"
-        ShadowDepth="1"
-        Color="#FFF3EBEB" />
-
-    <!--  Texture  -->
-    <ImageBrush
-        x:Key="NoisyBg"
-        ImageSource="\Themes\Resources\img\noisy-texture-100x100-o4-d13-c-fafafa-t0.png"
-        TileMode="FlipXY"
-        Viewport="0,0,100,100"
-        ViewportUnits="Absolute" />
 </ResourceDictionary>

+ 4 - 2
PicView/Views/Windows/MainWindow.xaml.cs

@@ -34,6 +34,7 @@ namespace PicView.Views.Windows
             {
                 ConfigColors.ChangeToLightTheme();
             }
+
             InitializeComponent();
 
             if (Settings.Default.AutoFitWindow == false)
@@ -50,13 +51,14 @@ namespace PicView.Views.Windows
             Loaded += (_, _) =>
             {
                 // Subscribe to Windows resized event || Need to be exactly on load
-                HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(ConfigureWindows.GetMainWindow).Handle);
-                source.AddHook(NativeMethods.WndProc);
+                HwndSource.FromHwnd(new WindowInteropHelper(ConfigureWindows.GetMainWindow).Handle)
+                    ?.AddHook(NativeMethods.WndProc);
                 LoadLanguage.DetermineLanguage();
                 StartLoading.LoadedEvent();
             };
             ContentRendered += delegate
             {
+                NativeMethods.EnableBlur(this);
                 StartLoading.ContentRenderedEvent();
 
                 // keyboard and Mouse_Keys Keys