Merge pull request #12 from emako/master

feat: support ClipToBounds for Border
OrgEleCho · Aug 29, 2024 · 43f2082 · 43f2082
2 parents 0a96a96 + 8fcdcfe
commit 43f2082
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/EleCho.WpfSuite.FluentDesign/EleCho.WpfSuite.FluentDesign.csproj b/EleCho.WpfSuite.FluentDesign/EleCho.WpfSuite.FluentDesign.csproj
@@ -24,10 +24,6 @@
     <ProjectReference Include="..\EleCho.WpfSuite\EleCho.WpfSuite.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Controls\" />
-  </ItemGroup>
-
   <ItemGroup>
     <Page Update="Styles\PasswordBoxResources.xaml">
       <SubType>Designer</SubType>

diff --git a/EleCho.WpfSuite/Controls/Border.cs b/EleCho.WpfSuite/Controls/Border.cs
@@ -53,7 +53,6 @@ public Geometry ContentClip
 
                 contentGeometry.Freeze();
                 return contentGeometry;
-
             }
             else
             {
@@ -62,10 +61,36 @@ public Geometry ContentClip
         }
 
         /// <inheritdoc/>
-        protected override void OnRender(DrawingContext dc)
+        protected override Size ArrangeOverride(Size finalSize)
         {
             SetValue(ContentClipPropertyKey, CalculateContentClip());
-            base.OnRender(dc);
+
+            return base.ArrangeOverride(finalSize);
+        }
+
+        /// <inheritdoc/>
+        protected override Geometry GetLayoutClip(Size layoutSlotSize)
+        {
+            var borderThickness = BorderThickness;
+            var cornerRadius = CornerRadius;
+            var renderSize = RenderSize;
+
+            if (renderSize.Width > 0 && renderSize.Height > 0)
+            {
+                var rect = new Rect(0, 0, renderSize.Width, renderSize.Height);
+                var radii = new Radii(cornerRadius, borderThickness, true);
+
+                var layoutGeometry = new StreamGeometry();
+                using StreamGeometryContext ctx = layoutGeometry.Open();
+                GenerateGeometry(ctx, rect, radii);
+
+                layoutGeometry.Freeze();
+                return layoutGeometry;
+            }
+            else
+            {
+                return base.GetLayoutClip(layoutSlotSize);
+            }
         }
 
         /// <summary>
@@ -200,10 +225,10 @@ private struct Radii
         {
             internal Radii(CornerRadius radii, Thickness borders, bool outer)
             {
-                double left     = 0.5 * borders.Left;
-                double top      = 0.5 * borders.Top;
-                double right    = 0.5 * borders.Right;
-                double bottom   = 0.5 * borders.Bottom;
+                double left = 0.5 * borders.Left;
+                double top = 0.5 * borders.Top;
+                double right = 0.5 * borders.Right;
+                double bottom = 0.5 * borders.Bottom;
 
                 if (outer)
                 {

diff --git a/WpfTest/Tests/TempPage.xaml b/WpfTest/Tests/TempPage.xaml
@@ -251,7 +251,14 @@
 
             <RepeatButton Content="QWQ"/>
 
-
+            <ws:Border ClipToBounds="True"
+                       CornerRadius="5 10 15 20"
+                       BorderThickness="3"
+                       BorderBrush="Red"
+                       MaxWidth="200"
+                       Name="testClip">
+                <Image Source="/Assets/TestImage2.jpg"/>
+            </ws:Border>
 
         </ws:StackPanel>
     </ws:ScrollViewer>