Merge branch 'master' into devsecops

aleks-ivanov · Nov 11, 2023 · 341c6ef · 341c6ef
2 parents 9e69090 + 5f72272
commit 341c6ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ModernWpf.Controls/Repeater/Layouts/FlowLayout/FlowLayoutAlgorithm.cs b/ModernWpf.Controls/Repeater/Layouts/FlowLayout/FlowLayoutAlgorithm.cs
@@ -471,9 +471,9 @@ private bool ShouldContinueFillingUpSpace(
 
                 // Ensure that both minor and major directions are taken into consideration so that if the scrolling direction
                 // is the same as the flow direction we still stop at the end of the viewport rectangle.
-                shouldContinue =
-                    (direction == GenerateDirection.Forward && elementMajorStart < rectMajorEnd && elementMinorStart < rectMinorEnd) ||
-                    (direction == GenerateDirection.Backward && elementMajorEnd > rectMajorStart && elementMinorEnd > rectMinorStart);
+                shouldContinue = direction == GenerateDirection.Forward
+                    ? elementMajorStart < rectMajorEnd && elementMinorStart < rectMinorEnd
+                    : elementMajorEnd > rectMajorStart && elementMinorEnd > rectMinorStart;
             }
 
             return shouldContinue;

diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
@@ -228,8 +228,8 @@
     <Color x:Key="ControlSolidFillColorDefault">#454545</Color>
 
     <Color x:Key="SubtleFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="SubtleFillColorSecondary">#0AFFFFFF</Color>
-    <Color x:Key="SubtleFillColorTertiary">#04FFFFFF</Color>
+    <Color x:Key="SubtleFillColorSecondary">#0FFFFFFF</Color>
+    <Color x:Key="SubtleFillColorTertiary">#0AFFFFFF</Color>
     <Color x:Key="SubtleFillColorDisabled">#00FFFFFF</Color>
 
     <Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
@@ -271,7 +271,7 @@
     <Color x:Key="CardBackgroundFillColorDefault">#0DFFFFFF</Color>
     <Color x:Key="CardBackgroundFillColorSecondary">#08FFFFFF</Color>
 
-    <Color x:Key="SmokeFillColorDefault">#4C000000</Color>
+    <Color x:Key="SmokeFillColorDefault">#332C2C2C</Color>
 
     <Color x:Key="LayerFillColorDefault">#09FFFFFF</Color>
     <Color x:Key="LayerFillColorAlt">#0DFFFFFF</Color>

diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
@@ -228,8 +228,8 @@
     <Color x:Key="ControlSolidFillColorDefault">#FFFFFF</Color>
 
     <Color x:Key="SubtleFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="SubtleFillColorSecondary">#06000000</Color>
-    <Color x:Key="SubtleFillColorTertiary">#03000000</Color>
+    <Color x:Key="SubtleFillColorSecondary">#09000000</Color>
+    <Color x:Key="SubtleFillColorTertiary">#06000000</Color>
     <Color x:Key="SubtleFillColorDisabled">#00FFFFFF</Color>
 
     <Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
@@ -271,7 +271,7 @@
     <Color x:Key="CardBackgroundFillColorDefault">#B3FFFFFF</Color>
     <Color x:Key="CardBackgroundFillColorSecondary">#80F6F6F6</Color>
 
-    <Color x:Key="SmokeFillColorDefault">#4D000000</Color>
+    <Color x:Key="SmokeFillColorDefault">#4DFFFFFF</Color>
 
     <Color x:Key="LayerFillColorDefault">#80FFFFFF</Color>
     <Color x:Key="LayerFillColorAlt">#FFFFFF</Color>