[gtk/path-work-rebased: 102/118] Add gsk_path_stroke




commit 213a92a775febf199cc5723f64f68b5d6d961145
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Dec 5 13:37:53 2020 -0500

    Add gsk_path_stroke
    
    Add the plumbing that will let us do special-case stroking
    for rectangles, circles and other special contours. There
    is no implementation yet.

 gsk/gskcontour.c        | 41 ++++++++++++++++++++++++++++++++++++++---
 gsk/gskcontourprivate.h |  6 ++++++
 gsk/gskpath.c           | 25 +++++++++++++++++++++++++
 gsk/gskpath.h           |  5 +++++
 4 files changed, 74 insertions(+), 3 deletions(-)
---
diff --git a/gsk/gskcontour.c b/gsk/gskcontour.c
index ab8d967f9c..cdd9adc754 100644
--- a/gsk/gskcontour.c
+++ b/gsk/gskcontour.c
@@ -86,6 +86,9 @@ struct _GskContourClass
   gboolean              (* get_stroke_bounds)   (const GskContour       *contour,
                                                  const GskStroke        *stroke,
                                                  graphene_rect_t        *bounds);
+  void                  (* add_stroke)          (const GskContour       *contour,
+                                                 GskPathBuilder         *builder,
+                                                 GskStroke              *stroke);
 };
 
 static gsize
@@ -492,6 +495,13 @@ gsk_rect_contour_get_stroke_bounds (const GskContour       *contour,
   return TRUE;
 }
 
+static void
+gsk_rect_contour_add_stroke (const GskContour *contour,
+                             GskPathBuilder   *builder,
+                             GskStroke        *stroke)
+{
+}
+
 static const GskContourClass GSK_RECT_CONTOUR_CLASS =
 {
   sizeof (GskRectContour),
@@ -509,7 +519,8 @@ static const GskContourClass GSK_RECT_CONTOUR_CLASS =
   gsk_rect_contour_copy,
   gsk_rect_contour_add_segment,
   gsk_rect_contour_get_winding,
-  gsk_rect_contour_get_stroke_bounds
+  gsk_rect_contour_get_stroke_bounds,
+  gsk_rect_contour_add_stroke
 };
 
 GskContour *
@@ -840,6 +851,13 @@ gsk_circle_contour_get_stroke_bounds (const GskContour       *contour,
   return TRUE;
 }
 
+static void
+gsk_circle_contour_add_stroke (const GskContour *contour,
+                               GskPathBuilder   *builder,
+                               GskStroke        *stroke)
+{
+}
+
 static const GskContourClass GSK_CIRCLE_CONTOUR_CLASS =
 {
   sizeof (GskCircleContour),
@@ -857,7 +875,8 @@ static const GskContourClass GSK_CIRCLE_CONTOUR_CLASS =
   gsk_circle_contour_copy,
   gsk_circle_contour_add_segment,
   gsk_circle_contour_get_winding,
-  gsk_circle_contour_get_stroke_bounds
+  gsk_circle_contour_get_stroke_bounds,
+  gsk_circle_contour_add_stroke
 };
 
 GskContour *
@@ -1545,6 +1564,13 @@ gsk_standard_contour_get_stroke_bounds (const GskContour *contour,
   return TRUE;
 }
 
+static void
+gsk_standard_contour_add_stroke (const GskContour *contour,
+                                 GskPathBuilder   *builder,
+                                 GskStroke        *stroke)
+{
+}
+
 static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
 {
   sizeof (GskStandardContour),
@@ -1562,7 +1588,8 @@ static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
   gsk_standard_contour_copy,
   gsk_standard_contour_add_segment,
   gsk_standard_contour_get_winding,
-  gsk_standard_contour_get_stroke_bounds
+  gsk_standard_contour_get_stroke_bounds,
+  gsk_standard_contour_add_stroke
 };
 
 /* You must ensure the contour has enough size allocated,
@@ -1734,6 +1761,14 @@ gsk_contour_get_stroke_bounds (const GskContour *self,
   return self->klass->get_stroke_bounds (self, stroke, bounds);
 }
 
+void
+gsk_contour_add_stroke (const GskContour *self,
+                        GskPathBuilder   *builder,
+                        GskStroke        *stroke)
+{
+  self->klass->add_stroke (self, builder, stroke);
+}
+
 void
 gsk_contour_copy (GskContour       *dest,
                   const GskContour *src)
diff --git a/gsk/gskcontourprivate.h b/gsk/gskcontourprivate.h
index 927205fdac..a8cea1eb95 100644
--- a/gsk/gskcontourprivate.h
+++ b/gsk/gskcontourprivate.h
@@ -96,6 +96,12 @@ void                    gsk_contour_add_segment                 (const GskContou
 gboolean                gsk_contour_get_stroke_bounds           (const GskContour       *self,
                                                                  const GskStroke        *stroke,
                                                                  graphene_rect_t        *bounds);
+void                    gsk_contour_add_stroke                  (const GskContour       *contour,
+                                                                 GskPathBuilder         *builder,
+                                                                 GskStroke              *stroke);
+void                    gsk_contour_default_add_stroke          (const GskContour       *contour,
+                                                                 GskPathBuilder         *builder,
+                                                                 GskStroke              *stroke);
 
 G_END_DECLS
 
diff --git a/gsk/gskpath.c b/gsk/gskpath.c
index 29069a7ccd..70630c86b2 100644
--- a/gsk/gskpath.c
+++ b/gsk/gskpath.c
@@ -1245,3 +1245,28 @@ gsk_path_get_stroke_bounds (GskPath         *path,
 
   return TRUE;
 }
+
+/**
+ * gsk_path_stroke:
+ * @self: a `GskPath`
+ * @stroke: stroke parameters
+ *
+ * Create a new path that follows the outline of the area
+ * that would be affected by stroking along @self with
+ * the given stroke parameters.
+ *
+ * Returns: a new `GskPath`
+ */
+GskPath *
+gsk_path_stroke (GskPath   *self,
+                 GskStroke *stroke)
+{
+  GskPathBuilder *builder;
+
+  builder = gsk_path_builder_new ();
+
+  for (int i = 0; i < self->n_contours; i++)
+    gsk_contour_add_stroke (gsk_path_get_contour (self, i), builder, stroke);
+
+  return gsk_path_builder_free_to_path (builder);
+}
diff --git a/gsk/gskpath.h b/gsk/gskpath.h
index d0e87fb582..ba463ec359 100644
--- a/gsk/gskpath.h
+++ b/gsk/gskpath.h
@@ -109,6 +109,11 @@ gboolean                gsk_path_foreach                        (GskPath
                                                                  GskPathForeachFunc      func,
                                                                  gpointer                user_data);
 
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_stroke                         (GskPath                *self,
+                                                                 GskStroke              *stroke);
+
+
 G_END_DECLS
 
 #endif /* __GSK_PATH_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]