[gtk/wip/matthiasc/lottie-stroke: 18/24] Merge branch 'matthiasc/miter-limit' into matthiasc/lottie-stroke
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/lottie-stroke: 18/24] Merge branch 'matthiasc/miter-limit' into matthiasc/lottie-stroke
- Date: Sun, 29 Nov 2020 18:57:12 +0000 (UTC)
commit 4e42b00aff3ec69f7d7bd32bebf630582ad31698
Merge: 7e668e6685 5069410fdf
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Nov 29 12:24:01 2020 -0500
Merge branch 'matthiasc/miter-limit' into matthiasc/lottie-stroke
gsk/gskenums.h | 5 +++++
gsk/gskstroke.c | 42 ++++++++++++++++++++++++++++++++++++++++++
gsk/gskstroke.h | 6 ++++++
gsk/gskstrokeprivate.h | 1 +
4 files changed, 54 insertions(+)
---
diff --cc gsk/gskenums.h
index f2adee8c23,bf1df8b43e..ba8c6ff54f
--- a/gsk/gskenums.h
+++ b/gsk/gskenums.h
@@@ -217,9 -217,10 +217,10 @@@ typedef enum
/**
* GskLineJoin:
* @GSK_LINE_JOIN_MITER: Use a sharp, angled corner
+ * @GSK_LINE_JOIN_MITER_CLIP: Use a sharp, angled corner, at a distance
* @GSK_LINE_JOIN_ROUND: Use a round join, the center of the circle is
- * the joing point
- * @GSK_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half
+ * the joint point
+ * @GSK_LINE_JOIN_BEVEL: Use a cut-off join, the join is cut off at half
* the line width from the joint point
*
* Specifies how to render the junction of two lines when stroking.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]