diff --git a/SukiUI.Demo/Features/ControlsLibrary/CollectionsView.axaml b/SukiUI.Demo/Features/ControlsLibrary/CollectionsView.axaml
index afcab1e02..e91635983 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/CollectionsView.axaml
+++ b/SukiUI.Demo/Features/ControlsLibrary/CollectionsView.axaml
@@ -39,7 +39,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
USA 1
diff --git a/SukiUI.Demo/Features/ControlsLibrary/Dialogs/DialogsView.axaml b/SukiUI.Demo/Features/ControlsLibrary/Dialogs/DialogsView.axaml
index 61a11b34e..e3217a266 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/Dialogs/DialogsView.axaml
+++ b/SukiUI.Demo/Features/ControlsLibrary/Dialogs/DialogsView.axaml
@@ -31,21 +31,21 @@
-
-
-
@@ -54,7 +54,7 @@
-
@@ -62,14 +62,14 @@
-
-
diff --git a/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml b/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml
index 9255c5436..05f5be9c6 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml
+++ b/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml
@@ -73,7 +73,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SukiUI.Demo/Features/Theming/ThemingView.axaml b/SukiUI.Demo/Features/Theming/ThemingView.axaml
index cbcff416f..1ba487558 100644
--- a/SukiUI.Demo/Features/Theming/ThemingView.axaml
+++ b/SukiUI.Demo/Features/Theming/ThemingView.axaml
@@ -159,7 +159,7 @@
diff --git a/SukiUI/ColorTheme/Dark.axaml b/SukiUI/ColorTheme/Dark.axaml
index 27b41d9b5..facb4f483 100644
--- a/SukiUI/ColorTheme/Dark.axaml
+++ b/SukiUI/ColorTheme/Dark.axaml
@@ -4,7 +4,7 @@
Transparent
#353535
Transparent
- #292929
+ #323232
#49aaaaaa
#333333
#505050
@@ -27,7 +27,7 @@
1 4 17 0 #111111
-
+
diff --git a/SukiUI/Content/Shaders/Background/bubble.sksl b/SukiUI/Content/Shaders/Background/bubble.sksl
index 57f2fc15d..47f2665d1 100644
--- a/SukiUI/Content/Shaders/Background/bubble.sksl
+++ b/SukiUI/Content/Shaders/Background/bubble.sksl
@@ -13,9 +13,9 @@ vec3 blendOverlay(vec3 base, vec3 blend) {
vec3 blendOverlayDark(vec3 base, vec3 blend) {
vec3 result;
- result.r = (base.r < 0.5) ? (4 * base.r * blend.r) : (3.5 - 2.0 * (3 - base.r) * (3.5 - blend.r));
- result.g = (base.g < 0.5) ? (4 * base.g * blend.g) : (3.5 - 2.0 * (3 - base.g) * (3.5 - blend.g));
- result.b = (base.b < 0.5) ? (4 * base.b * blend.b) : (3.5 - 2.0 * (3 - base.b) * (3.5 - blend.b));
+ result.r = (base.r < 0.5) ? (5 * base.r * blend.r) : (4 - 2.0 * (3 - base.r) * (4 - blend.r));
+ result.g = (base.g < 0.5) ? (5 * base.g * blend.g) : (4 - 2.0 * (3 - base.g) * (4 - blend.g));
+ result.b = (base.b < 0.5) ? (5 * base.b * blend.b) : (4 - 2.0 * (3 - base.b) * (4 - blend.b));
return mix(base, clamp(result, 0.0, 1.0), 0.5); // Mélange avec la couleur de base pour réduire l'assombrissement
}
@@ -66,16 +66,16 @@ vec4 main(vec2 fragCoord) {
float opacityLayer2 = 0.85 - (iDark / 2);
- float iPrimaryOpacity = 1; // Exemple de nouvelle opacité pour iPrimary
+ float iPrimaryOpacity = 1.1; // Exemple de nouvelle opacité pour iPrimary
if (iDark == 1) {
- iPrimaryOpacity = 0.28;
+ iPrimaryOpacity = 0.52;
}
vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
- float iAccentOpacity = 0.8;
+ float iAccentOpacity = 1;
if (iDark == 1) {
- iAccentOpacity = 0.34;
+ iAccentOpacity = 0.9;
}
vec3 iAccentWithOpacity = iAccent * iAccentOpacity;
diff --git a/SukiUI/Content/Shaders/Background/bubblestrong.sksl b/SukiUI/Content/Shaders/Background/bubblestrong.sksl
index 2ae3213cc..47f2665d1 100644
--- a/SukiUI/Content/Shaders/Background/bubblestrong.sksl
+++ b/SukiUI/Content/Shaders/Background/bubblestrong.sksl
@@ -13,9 +13,9 @@ vec3 blendOverlay(vec3 base, vec3 blend) {
vec3 blendOverlayDark(vec3 base, vec3 blend) {
vec3 result;
- result.r = (base.r < 0.5) ? (4 * base.r * blend.r) : (3.5 - 2.0 * (3 - base.r) * (3.5 - blend.r));
- result.g = (base.g < 0.5) ? (4 * base.g * blend.g) : (3.5 - 2.0 * (3 - base.g) * (3.5 - blend.g));
- result.b = (base.b < 0.5) ? (4 * base.b * blend.b) : (3.5 - 2.0 * (3 - base.b) * (3.5 - blend.b));
+ result.r = (base.r < 0.5) ? (5 * base.r * blend.r) : (4 - 2.0 * (3 - base.r) * (4 - blend.r));
+ result.g = (base.g < 0.5) ? (5 * base.g * blend.g) : (4 - 2.0 * (3 - base.g) * (4 - blend.g));
+ result.b = (base.b < 0.5) ? (5 * base.b * blend.b) : (4 - 2.0 * (3 - base.b) * (4 - blend.b));
return mix(base, clamp(result, 0.0, 1.0), 0.5); // Mélange avec la couleur de base pour réduire l'assombrissement
}
@@ -68,14 +68,14 @@ vec4 main(vec2 fragCoord) {
float iPrimaryOpacity = 1.1; // Exemple de nouvelle opacité pour iPrimary
if (iDark == 1) {
- iPrimaryOpacity = 0.34;
+ iPrimaryOpacity = 0.52;
}
vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
float iAccentOpacity = 1;
if (iDark == 1) {
- iAccentOpacity = 0.55;
+ iAccentOpacity = 0.9;
}
vec3 iAccentWithOpacity = iAccent * iAccentOpacity;
diff --git a/SukiUI/Content/Shaders/Background/flat.sksl b/SukiUI/Content/Shaders/Background/flat.sksl
index b3d365236..c671dcff3 100644
--- a/SukiUI/Content/Shaders/Background/flat.sksl
+++ b/SukiUI/Content/Shaders/Background/flat.sksl
@@ -1,7 +1,7 @@
vec4 main(vec2 fragCoord) {
if(iDark == 1)
- return vec4(iBase * 0.7, iAlpha);
+ return vec4(iBase * 1, iAlpha);
return vec4(iBase, iAlpha);
}
\ No newline at end of file
diff --git a/SukiUI/Content/Shaders/Background/gradient.sksl b/SukiUI/Content/Shaders/Background/gradient.sksl
index b071e431b..18a88ab0d 100644
--- a/SukiUI/Content/Shaders/Background/gradient.sksl
+++ b/SukiUI/Content/Shaders/Background/gradient.sksl
@@ -13,9 +13,9 @@ vec3 blendOverlay(vec3 base, vec3 blend) {
vec3 blendOverlayDark(vec3 base, vec3 blend) {
vec3 result;
- result.r = (base.r < 0.5) ? (4 * base.r * blend.r) : (3.5 - 2.0 * (3 - base.r) * (3.5 - blend.r));
- result.g = (base.g < 0.5) ? (4 * base.g * blend.g) : (3.5 - 2.0 * (3 - base.g) * (3.5 - blend.g));
- result.b = (base.b < 0.5) ? (4 * base.b * blend.b) : (3.5 - 2.0 * (3 - base.b) * (3.5 - blend.b));
+ result.r = (base.r < 0.5) ? (2 * base.r * blend.r) : (4 - 1.5 * (3 - base.r) * (4 - blend.r));
+ result.g = (base.g < 0.5) ? (2* base.g * blend.g) : (4 - 1.5 * (3 - base.g) * (4 - blend.g));
+ result.b = (base.b < 0.5) ? (2 * base.b * blend.b) : (4 - 1.5 * (3 - base.b) * (4 - blend.b));
return mix(base, clamp(result, 0.0, 1.0), 0.5); // Mélange avec la couleur de base pour réduire l'assombrissement
}
@@ -66,16 +66,16 @@ vec4 main(vec2 fragCoord) {
float opacityLayer2 = 0.85 - (iDark / 2);
- float iPrimaryOpacity = 0.8; // Exemple de nouvelle opacité pour iPrimary
+ float iPrimaryOpacity = 0.2; // Exemple de nouvelle opacité pour iPrimary
if (iDark == 1) {
- iPrimaryOpacity = 0.32;
+ iPrimaryOpacity = 0.8;
}
vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
- float iAccentOpacity = 0;
+ float iAccentOpacity = 1;
if (iDark == 1) {
- iAccentOpacity = 0;
+ iAccentOpacity = 1.8;
}
vec3 iAccentWithOpacity = iPrimary * iAccentOpacity;
diff --git a/SukiUI/Controls/SukiDialog.axaml b/SukiUI/Controls/SukiDialog.axaml
index 522247f11..3d685b958 100644
--- a/SukiUI/Controls/SukiDialog.axaml
+++ b/SukiUI/Controls/SukiDialog.axaml
@@ -12,22 +12,10 @@
Background="{DynamicResource SukiCardBackground}"
CornerRadius="25">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/SukiUI/Controls/SukiWindow.axaml b/SukiUI/Controls/SukiWindow.axaml
index 050cbe921..fda38e745 100644
--- a/SukiUI/Controls/SukiWindow.axaml
+++ b/SukiUI/Controls/SukiWindow.axaml
@@ -29,7 +29,7 @@
-
+
+
+
+
+ 0.4
+
+
+
+
+
action, boo
{
Content = buttonContent,
Classes = { flatstyle ?"Flat" : "Basic" },
- Margin = flatstyle ? new Thickness(14, 9, 0, 12) : new Thickness(14, -3, 0, 3)
+ Margin = flatstyle ? new Thickness(14, 9, 0, 12) : new Thickness(14, -3, 0, 2)
};
diff --git a/SukiUI/Utilities/Effects/SukiEffect.cs b/SukiUI/Utilities/Effects/SukiEffect.cs
index 3aef94aec..9f54eb50b 100644
--- a/SukiUI/Utilities/Effects/SukiEffect.cs
+++ b/SukiUI/Utilities/Effects/SukiEffect.cs
@@ -125,6 +125,7 @@ public override bool Equals(object obj)
}
private static readonly float[] White = { 0.95f, 0.95f, 0.95f };
+
internal SKShader ToShaderWithUniforms(float timeSeconds, ThemeVariant activeVariant, Rect bounds,
float animationScale, float alpha = 1f)