looks nice enough to me

kikipoulet · Jul 9, 2024 · dfc8387 · dfc8387
1 parent 867e560
commit dfc8387
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/SukiUI/ColorTheme/Dark.axaml b/SukiUI/ColorTheme/Dark.axaml
@@ -5,7 +5,7 @@
     <Color x:Key="SukiStrongBackground">#353535</Color>
     <Color x:Key="SukiLightBackground">Transparent</Color>
     <Color x:Key="SukiCardBackground">#353535</Color>
-    <Color x:Key="SukiGlassCardBackground">#393939</Color>
+    <Color x:Key="SukiGlassCardBackground">#494949</Color>
     <Color x:Key="SukiGlassCardOpaqueBackground">#222222</Color>
     <Color x:Key="SukiControlTouchBackground">#505050</Color>
     <Color x:Key="SukiDialogBackground">#000000</Color>

diff --git a/SukiUI/ColorTheme/Light.axaml b/SukiUI/ColorTheme/Light.axaml
@@ -5,7 +5,7 @@
     <Color x:Key="SukiStrongBackground">#fafafa</Color>
     <Color x:Key="SukiLightBackground">Transparent</Color>
     <Color x:Key="SukiCardBackground">#fafafa</Color>
-    <Color x:Key="SukiGlassCardBackground">#fefefe</Color>
+    <Color x:Key="SukiGlassCardBackground">White</Color>
     <Color x:Key="SukiGlassCardOpaqueBackground">#fcfcfc</Color>
     <Color x:Key="SukiControlTouchBackground">#FFFFFF</Color>
     <Color x:Key="SukiDialogBackground">Gray</Color>
@@ -35,7 +35,7 @@
     <system:Boolean x:Key="IsDark">False</system:Boolean>
     <system:Boolean x:Key="IsLight">True</system:Boolean>
 
-    <system:Double x:Key="GlassOpacity">0.4</system:Double>
-    <system:Double x:Key="GlassOpacityDark">0.29</system:Double>
-    <system:Double x:Key="GlassOpacityLight">0.4</system:Double>
+    <system:Double x:Key="GlassOpacity">0.42</system:Double>
+    <system:Double x:Key="GlassOpacityDark">0.3</system:Double>
+    <system:Double x:Key="GlassOpacityLight">0.42</system:Double>
 </ResourceDictionary>
diff --git a/SukiUI/Content/Shaders/Background/gradient.sksl b/SukiUI/Content/Shaders/Background/gradient.sksl
@@ -68,14 +68,14 @@ vec4 main(vec2 fragCoord) {
 
     float iPrimaryOpacity = 1; // Exemple de nouvelle opacité pour iPrimary
     if (iDark == 1) {
-        iPrimaryOpacity = 0.3;
+        iPrimaryOpacity = 0.26;
     }
     vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
 
 
     float iAccentOpacity = 0.8; 
     if (iDark == 1) {
-            iAccentOpacity = 0.15;
+            iAccentOpacity = 0.3;
         }
     vec3 iAccentWithOpacity = iAccent * iAccentOpacity;
 

diff --git a/SukiUI/Controls/GlassMorphism/GlassCard.axaml b/SukiUI/Controls/GlassMorphism/GlassCard.axaml
@@ -35,6 +35,12 @@
                             </Transitions>
                         </Border.Transitions>
                     </Border>
+
+                    <Border 
+                            Background="{DynamicResource SukiPrimaryColor1}"
+                           IsVisible="{DynamicResource IsDark}"
+                            ClipToBounds="{TemplateBinding ClipToBounds}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
 
                     <Border Name="PART_ClipBorder"
                             Background="{DynamicResource SukiPrimaryColor0}"

diff --git a/SukiUI/Controls/SukiWindow.axaml b/SukiUI/Controls/SukiWindow.axaml
@@ -28,7 +28,8 @@
                                                  Style="{TemplateBinding BackgroundStyle}"
                                                  TransitionTime="{TemplateBinding BackgroundTransitionTime}"
                                                  TransitionsEnabled="{TemplateBinding BackgroundTransitionsEnabled}" />
-                            <Panel Background="White" Opacity="0.7" IsVisible="{DynamicResource IsLight}" />
+                            <Panel Background="White" Opacity="0.1" IsVisible="{DynamicResource IsLight}" />
+                            <Panel Background="White" Opacity="0.03" IsVisible="{DynamicResource IsDark}" />
                             <DockPanel LastChildFill="True">
                                 <Panel DockPanel.Dock="Top">
                                     <Panel.Styles>