Allow pixmaps to specify their width and height to control/knots. Allows non-square nodes.

(bzr r12605)

1 files changed, 5 insertions, 25 deletions

diff --git a/src/knot.cpp b/src/knot.cpp
index 890abd0a1..2b67440dc 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -646,34 +646,14 @@ void sp_knot_update_ctrl(SPKnot *knot)
  */
 static void sp_knot_set_ctrl_state(SPKnot *knot)
 {
+    int state = SP_KNOT_STATE_NORMAL;
     if (knot->flags & SP_KNOT_DRAGGING) {
-        g_object_set(knot->item,
-                       "fill_color",
-                       knot->fill[SP_KNOT_STATE_DRAGGING],
-                       NULL);
-        g_object_set(knot->item,
-                       "stroke_color",
-                       knot->stroke[SP_KNOT_STATE_DRAGGING],
-                       NULL);
+        state = SP_KNOT_STATE_DRAGGING;
     } else if (knot->flags & SP_KNOT_MOUSEOVER) {
-        g_object_set(knot->item,
-                       "fill_color",
-                       knot->fill[SP_KNOT_STATE_MOUSEOVER],
-                       NULL);
-        g_object_set(knot->item,
-                       "stroke_color",
-                       knot->stroke[SP_KNOT_STATE_MOUSEOVER],
-                       NULL);
-    } else {
-        g_object_set(knot->item,
-                       "fill_color",
-                        knot->fill[SP_KNOT_STATE_NORMAL],
-                       NULL);
-        g_object_set(knot->item,
-                       "stroke_color",
-                       knot->stroke[SP_KNOT_STATE_NORMAL],
-                       NULL);
+        state = SP_KNOT_STATE_MOUSEOVER;
     }
+    g_object_set(knot->item, "fill_color",   knot->fill[state],   NULL);
+    g_object_set(knot->item, "stroke_color", knot->stroke[state], NULL);
 }