merge ::dragging and ::dynahand

diff --git a/ChangeLog b/ChangeLog
index 03d4b32fb74228ee12b9a27562220f5e0b7142eb..9b6579cb250f6d6c2273406d36e066802db5ef66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-31  MenTaLguY  <mental@rydia.net>
+
+    * src/dyna-draw-context.cpp, src/dyna-draw-context.cpp:
+
+         merge ::dragging and ::dynahand
+
 2006-03-31  MenTaLguY  <mental@rydia.net>
 
     * src/dyna-draw-context.h: add documentation

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 96882f3f3e24c05cb2181b61778d8be994ce357c..02ca80b202c9da06a7c0eb2fb6993df81808114c 100644 (file)
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -47,7 +47,6 @@
 #include "sp-item.h"
 
 #define DDC_RED_RGBA 0xff0000ff
-#define DDC_GREEN_RGBA 0x000000ff
 
 #define SAMPLE_TIMEOUT 10
 #define TOLERANCE_LINE 1.0
@@ -148,7 +147,6 @@ sp_dyna_draw_context_init(SPDynaDrawContext *ddc)
     ddc->use_timeout = FALSE;
     ddc->timer_id = 0;
     ddc->dragging = FALSE;
-    ddc->dynahand = FALSE;
 
     ddc->mass = 0.3;
     ddc->drag = DRAG_DEFAULT;
@@ -449,7 +447,6 @@ sp_dyna_draw_timeout_handler(gpointer data)
     SPCanvas *canvas = SP_CANVAS(SP_DT_CANVAS(desktop));
 
     dc->dragging = TRUE;
-    dc->dynahand = TRUE;
 
     int x, y;
     gtk_widget_get_pointer(GTK_WIDGET(canvas), &x, &y);
@@ -530,7 +527,6 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
     case GDK_MOTION_NOTIFY:
         if ( dc->is_drawing && !dc->use_timeout && ( event->motion.state & GDK_BUTTON1_MASK ) ) {
             dc->dragging = TRUE;
-            dc->dynahand = TRUE;
 
             NR::Point const motion_w(event->motion.x,
                                      event->motion.y);
@@ -564,24 +560,20 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
         if ( dc->dragging && event->button.button == 1 ) {
             dc->dragging = FALSE;
 
-            /* release */
-            if (dc->dynahand) {
-                dc->dynahand = FALSE;
-                /* Remove all temporary line segments */
-                while (dc->segments) {
-                    gtk_object_destroy(GTK_OBJECT(dc->segments->data));
-                    dc->segments = g_slist_remove(dc->segments, dc->segments->data);
-                }
-                /* Create object */
-                fit_and_split(dc, TRUE);
-                accumulate_calligraphic(dc);
-                set_to_accumulated(dc); /* temporal implementation */
-                /* reset accumulated curve */
-                sp_curve_reset(dc->accumulated);
-                clear_current(dc);
-                if (dc->repr) {
-                    dc->repr = NULL;
-                }
+            /* Remove all temporary line segments */
+            while (dc->segments) {
+                gtk_object_destroy(GTK_OBJECT(dc->segments->data));
+                dc->segments = g_slist_remove(dc->segments, dc->segments->data);
+            }
+            /* Create object */
+            fit_and_split(dc, TRUE);
+            accumulate_calligraphic(dc);
+            set_to_accumulated(dc); /* temporal implementation */
+            /* reset accumulated curve */
+            sp_curve_reset(dc->accumulated);
+            clear_current(dc);
+            if (dc->repr) {
+                dc->repr = NULL;
             }
             ret = TRUE;
         }

diff --git a/src/dyna-draw-context.h b/src/dyna-draw-context.h
index 06aeca1e34f9444f499821bf75dac9fdf65eea05..feb38c2f8b745d56357325263c47e1e249faffb4 100644 (file)
--- a/src/dyna-draw-context.h
+++ b/src/dyna-draw-context.h
@@ -87,9 +87,7 @@ struct SPDynaDrawContext
     gdouble xtilt;
     gdouble ytilt;
     /* attributes */
-    /* fixme: shuld be merge dragging and dynahand ?? */
     guint dragging : 1;           /* mouse state: mouse is dragging */
-    guint dynahand : 1;           /* mouse state: mouse is in draw */
     guint use_timeout : 1;
     double mass, drag;
     double angle;