diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-08-18 00:33:13 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-08-18 00:33:13 +0000 |
| commit | d2eab659b08ba4a28410ed2527ba0431832776b3 (patch) | |
| tree | 05f5786b153121b010abb01713e0ffa364ac82f9 /src/pen-context.cpp | |
| parent | reimplement acceptsNumParams(); instead of making it a virtual function we ju... (diff) | |
| download | inkscape-d2eab659b08ba4a28410ed2527ba0431832776b3.tar.gz inkscape-d2eab659b08ba4a28410ed2527ba0431832776b3.zip | |
Remove done_pathparam_set and friends because it currently isn't used any more anyway; reimplement its intended functionality by using isReady()
(bzr r6643)
Diffstat (limited to 'src/pen-context.cpp')
| -rw-r--r-- | src/pen-context.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 3cc7cc0d6..8e1f6947b 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -152,6 +152,7 @@ sp_pen_context_init(SPPenContext *pc) pc->num_clicks = 0; pc->waiting_LPE = NULL; + pc->waiting_item = NULL; } /** @@ -564,7 +565,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const } } - if (pc->expecting_clicks_for_LPE) { + if (pc->expecting_clicks_for_LPE > 0) { --pc->expecting_clicks_for_LPE; } @@ -1383,10 +1384,12 @@ sp_pen_context_wait_for_LPE_mouse_clicks(SPPenContext *pc, Inkscape::LivePathEff { g_print ("Now waiting for %s to be applied\n", Inkscape::LivePathEffect::LPETypeConverter.get_label(effect_type).c_str()); + g_return_if_fail(effect_type != Inkscape::LivePathEffect::INVALID_LPE); + + pc->waiting_LPE_type = effect_type; pc->expecting_clicks_for_LPE = num_clicks; pc->polylines_only = use_polylines; pc->polylines_paraxial = false; // TODO: think if this is correct for all cases - pc->waiting_LPE_type = effect_type; } static int pen_next_paraxial_direction(const SPPenContext *const pc, |