diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-07 18:48:31 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-07 18:48:31 +0000 |
| commit | 60688fe72a9a75ac54d895a7aa61d3a0518ca8ab (patch) | |
| tree | 79a1e89ae0cb44bb752cfd48666dcd017133fac6 /src | |
| parent | Fix bug:1630821 on LPE selected nodes (diff) | |
| download | inkscape-60688fe72a9a75ac54d895a7aa61d3a0518ca8ab.tar.gz inkscape-60688fe72a9a75ac54d895a7aa61d3a0518ca8ab.zip | |
Fix bug:1630796 on flatten button
Fixed bugs:
- https://launchpad.net/bugs/1630796
(bzr r15150)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/livepatheffect-editor.h | 5 | ||||
| -rw-r--r-- | src/widgets/pencil-toolbar.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h index 489e9564d..8e9e66435 100644 --- a/src/ui/dialog/livepatheffect-editor.h +++ b/src/ui/dialog/livepatheffect-editor.h @@ -49,6 +49,8 @@ public: void onSelectionModified(Inkscape::Selection *sel); virtual void on_effect_selection_changed(); void setDesktop(SPDesktop *desktop); + // void add_entry(const char* name ); + void effect_list_reload(SPLPEItem *lpeitem); private: @@ -70,9 +72,6 @@ private: void showText(Glib::ustring const &str); void selectInList(LivePathEffect::Effect* effect); - // void add_entry(const char* name ); - void effect_list_reload(SPLPEItem *lpeitem); - // callback methods for buttons on grids page. void onAdd(); void onRemove(); diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index 582fb66ba..b177c42b4 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -50,6 +50,7 @@ #include "live_effects/lpe-powerstroke.h" #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" +#include "ui/dialog/livepatheffect-editor.h" using Inkscape::UI::UXManager; using Inkscape::UI::ToolboxFactory; @@ -242,7 +243,7 @@ static void sp_simplify_flatten(GtkWidget * /*widget*/, GObject *obj) SPLPEItem* lpeitem = dynamic_cast<SPLPEItem*>(*it); if (lpeitem && lpeitem->hasPathEffect()){ PathEffectList lpelist = lpeitem->getEffectList(); - std::list<Inkscape::LivePathEffect::LPEObjectReference *>::iterator i; + PathEffectList::iterator i; for (i = lpelist.begin(); i != lpelist.end(); ++i) { LivePathEffectObject *lpeobj = (*i)->lpeobject; if (lpeobj) { @@ -260,7 +261,10 @@ static void sp_simplify_flatten(GtkWidget * /*widget*/, GObject *obj) lpeitem->removeCurrentPathEffect(false); shape->setCurve(c,0); } + Inkscape::UI::Dialog::LivePathEffectEditor *lpeeditor = new Inkscape::UI::Dialog::LivePathEffectEditor(); + lpeeditor->effect_list_reload(lpeitem); break; + } } } |