summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-10-07 18:03:23 +0000
committerjabiertxof <info@marker.es>2016-10-07 18:03:23 +0000
commiteb4b3b8d4823f7a9cef4e623080e3d1e4b7426eb (patch)
treec397f4a5470220970019e40f379811e6d3a3415b /src
parentMerge jabier's Measure line LPE (diff)
downloadinkscape-eb4b3b8d4823f7a9cef4e623080e3d1e4b7426eb.tar.gz
inkscape-eb4b3b8d4823f7a9cef4e623080e3d1e4b7426eb.zip
Fix bug:1630821 on LPE selected nodes
Fixed bugs: - https://launchpad.net/bugs/1630821 (bzr r15149)
Diffstat (limited to 'src')
-rw-r--r--src/ui/tools/node-tool.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 2bd4fdea3..f3679b40f 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -285,13 +285,11 @@ void NodeTool::update_helperpath () {
if (SP_IS_LPE_ITEM(selection->singleItem())) {
Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
- Inkscape::UI::ControlPointSelection::Set &selectionNodes = _selected_nodes->allPoints();
+ Inkscape::UI::ControlPointSelection *selectionNodes = _selected_nodes;
std::vector<Geom::Point> selectedNodesPositions;
- for (Inkscape::UI::ControlPointSelection::Set::iterator i = selectionNodes.begin(); i != selectionNodes.end(); ++i) {
- if ((*i)->selected()) {
- Inkscape::UI::Node *n = dynamic_cast<Inkscape::UI::Node *>(*i);
- selectedNodesPositions.push_back(n->position());
- }
+ for (Inkscape::UI::ControlPointSelection::iterator i = selectionNodes->begin(); i != selectionNodes->end(); ++i) {
+ Inkscape::UI::Node *n = dynamic_cast<Inkscape::UI::Node *>(*i);
+ selectedNodesPositions.push_back(n->position());
}
lpe->setSelectedNodePoints(selectedNodesPositions);
lpe->setCurrentZoom(this->desktop->current_zoom());
@@ -470,6 +468,7 @@ bool NodeTool::root_handler(GdkEvent* event) {
switch (event->type)
{
case GDK_MOTION_NOTIFY: {
+ update_helperpath();
combine_motion_events(desktop->canvas, event->motion, 0);
SPItem *over_item = sp_event_context_find_item (desktop, event_point(event->button),
FALSE, TRUE);