Improved links computation and handled loops in the graph layout.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gtkext/graph/edge.h b/src/gtkext/graph/edge.h
index d000eb5..23fcf8d 100644
--- a/src/gtkext/graph/edge.h
+++ b/src/gtkext/graph/edge.h
@@ -64,19 +64,19 @@ typedef enum _EdgeColor
 GType g_graph_edge_get_type(void);
 
 /* Etablit un lien graphique entre deux noeuds graphiques. */
-GGraphEdge *_g_graph_edge_new(const GdkPoint *, const GdkPoint **, size_t, const GdkPoint *, EdgeColor);
+GGraphEdge *_g_graph_edge_new(const GdkPoint **, size_t, EdgeColor);
 
-#define g_graph_edge_new(start, y, end) \
-    _g_graph_edge_new(start, (const GdkPoint *[]) { y }, 1, end, EGC_DEFAULT)
+#define g_graph_edge_new(pts0, pts1, pte0, pte1) \
+    _g_graph_edge_new((const GdkPoint *[]) { pts0, pts1, pte0, pte1 }, 4, EGC_DEFAULT)
 
-#define g_graph_edge_new_true(start, y, end) \
-    _g_graph_edge_new(start, (const GdkPoint *[]) { y }, 1, end, EGC_GREEN)
+#define g_graph_edge_new_true(pts0, pts1, pte0, pte1) \
+    _g_graph_edge_new((const GdkPoint *[]) { pts0, pts1, pte0, pte1 }, 4, EGC_GREEN)
 
-#define g_graph_edge_new_false(start, y, end) \
-    _g_graph_edge_new(start, (const GdkPoint *[]) { y }, 1, end, EGC_RED)
+#define g_graph_edge_new_false(pts0, pts1, pte0, pte1) \
+    _g_graph_edge_new((const GdkPoint *[]) { pts0, pts1, pte0, pte1 }, 4, EGC_RED)
 
-#define g_graph_edge_new_loop(start, yt, yb, end) \
-    _g_graph_edge_new(start, (const GdkPoint *[]) { yt, yb }, 2, end, EGC_BLUE)
+#define g_graph_edge_new_loop(pts0, pts1, ptl0, ptl1, pte0, pte1) \
+    _g_graph_edge_new((const GdkPoint *[]) { pts0, pts1, ptl0, ptl1, pte0, pte1 }, 6, EGC_BLUE)
 
 /* Fournit les abscisses des points extrèmes de la ligne. */
 void g_graph_edge_get_x_borders(const GGraphEdge *, gint *, gint *);