more unreffing temporary styles properly

[inkscape.git] / src / dyna-draw-context.cpp

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 1ee339465dc2f1b18562f23d795cecc2c0e384eb..f6f59fe6b375d5fdab3247be36dec9573905f69d 100644 (file)
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -198,6 +198,7 @@ sp_dyna_draw_context_init(SPDynaDrawContext *ddc)
     ddc->keep_selected = true;
 
     ddc->hatch_spacing = 0;
+    ddc->hatch_spacing_step = 0;
     new (&ddc->hatch_pointer_past) std::list<double>();
     new (&ddc->hatch_nearest_past) std::list<double>();
     ddc->hatch_last_nearest = NR::Point(0,0);
@@ -211,6 +212,7 @@ sp_dyna_draw_context_init(SPDynaDrawContext *ddc)
     ddc->trace_bg = false;
 
     ddc->is_dilating = false;
+    ddc->has_dilated = false;
 }
 
 static void
@@ -615,7 +617,8 @@ sp_ddc_dilate_recursive (SPItem *item, NR::Point p, bool expand, double radius,
     if (SP_IS_GROUP(item)) {
         for (SPObject *child = sp_object_first_child(SP_OBJECT(item)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
             if (SP_IS_ITEM(child)) {
-                did = did || sp_ddc_dilate_recursive (SP_ITEM(child), p, expand, radius, offset);
+                if (sp_ddc_dilate_recursive (SP_ITEM(child), p, expand, radius, offset))
+                    did = true;
             }
         }
 
@@ -735,7 +738,8 @@ sp_ddc_dilate (SPDynaDrawContext *dc, NR::Point p, bool expand)
 
         SPItem *item = (SPItem *) items->data;
 
-        did = did || sp_ddc_dilate_recursive (item, p, expand, radius, offset);
+        if (sp_ddc_dilate_recursive (item, p, expand, radius, offset))
+            did = true;
 
     }
 
@@ -822,13 +826,14 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
                                     NULL,
                                     event->button.time);
 
-                if (event->motion.state & GDK_MOD1_MASK) {
-                    sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 3);
-                }
-
                 ret = TRUE;
 
+                sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 3);
                 dc->is_drawing = true;
+                if (event->button.state & GDK_MOD1_MASK) {
+                    dc->is_dilating = true;
+                    dc->has_dilated = false;
+                }
             }
             break;
         case GDK_MOTION_NOTIFY:
@@ -867,7 +872,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             // dilating:
             if (dc->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK ) && event->motion.state & GDK_MOD1_MASK) {  
                 sp_ddc_dilate (dc, desktop->dt2doc(motion_dt), event->motion.state & GDK_SHIFT_MASK? true : false);
-                dc->is_dilating = true;
+                dc->has_dilated = true;
                 // it's slow, so prevent clogging up with events
                 gobble_motion_events(GDK_BUTTON1_MASK);
                 return TRUE;
@@ -1078,21 +1083,30 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
 
 
     case GDK_BUTTON_RELEASE:
+    {
+        NR::Point const motion_w(event->button.x, event->button.y);
+        NR::Point const motion_dt(desktop->w2d(motion_w));
+
         sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+        sp_canvas_end_forced_full_redraws(desktop->canvas);
         dc->is_drawing = false;
 
         if ( dc->is_dilating && event->button.button == 1 ) {
+            if (!dc->has_dilated) {
+                // if we did not rub, do a light tap
+                dc->pressure = 0.03;
+                sp_ddc_dilate (dc, desktop->dt2doc(motion_dt), event->button.state & GDK_SHIFT_MASK? true : false);
+            }
             dc->is_dilating = false;
-            sp_canvas_end_forced_full_redraws(desktop->canvas);
+            dc->has_dilated = false;
             sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(dc)->desktop), 
                          SP_VERB_CONTEXT_CALLIGRAPHIC,
                          (event->button.state & GDK_SHIFT_MASK ? _("Thicken paths") : _("Thin paths")));
             ret = TRUE;
+
         } else if ( dc->dragging && event->button.button == 1 ) {
             dc->dragging = FALSE;
 
-            NR::Point const motion_w(event->button.x, event->button.y);
-            NR::Point const motion_dt(desktop->w2d(motion_w));
             sp_dyna_draw_apply(dc, motion_dt);
 
             /* Remove all temporary line segments */
@@ -1123,10 +1137,19 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             dc->hatch_item = NULL;
             dc->hatch_livarot_path = NULL;
 
+            if (dc->hatch_spacing != 0 && !dc->keep_selected) { 
+                // we do not select the newly drawn path, so increase spacing by step
+                if (dc->hatch_spacing_step == 0) {
+                    dc->hatch_spacing_step = dc->hatch_spacing;
+                }
+                dc->hatch_spacing += dc->hatch_spacing_step;
+            }
+
             dc->_message_context->clear();
             ret = TRUE;
         }
         break;
+    }
 
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
@@ -1241,6 +1264,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             case GDK_Control_R:
                 dc->_message_context->clear();
                 dc->hatch_spacing = 0;
+                dc->hatch_spacing_step = 0;
                 break;
             case GDK_Alt_L:
             case GDK_Alt_R:
@@ -1327,9 +1351,7 @@ set_to_accumulated(SPDynaDrawContext *dc, bool unionize)
         } else {
             if (dc->keep_selected) {
                 sp_desktop_selection(desktop)->set(dc->repr);
-            } else {
-                sp_desktop_selection(desktop)->clear();
-            }
+            } 
         }
 
     } else {