diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-01 01:42:13 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-03-01 01:42:13 +0000 |
| commit | 145f815859ba21f45e67d315e52f360f029355c7 (patch) | |
| tree | 54448bc60a94415f63f7b6f46296c8d5e2ac58a6 /src/ui/tools | |
| parent | Improve fill rule and add mass option (diff) | |
| parent | type in commit r14664 (diff) | |
| download | inkscape-145f815859ba21f45e67d315e52f360f029355c7.tar.gz inkscape-145f815859ba21f45e67d315e52f360f029355c7.zip | |
update to trunk
(bzr r14648.1.3)
Diffstat (limited to 'src/ui/tools')
| -rw-r--r-- | src/ui/tools/mesh-tool.cpp | 6 | ||||
| -rw-r--r-- | src/ui/tools/select-tool.cpp | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 7db4e09d8..47927667c 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -458,7 +458,7 @@ bool MeshTool::root_handler(GdkEvent* event) { SPCtrlCurve *line = NULL; if (! drag->lines.empty()) { - for (std::vector<SPCtrlLine *>::const_iterator l = drag->lines.begin(); l != drag->lines.end() && (!over_line); l++) { + for (std::vector<SPCtrlLine *>::const_iterator l = drag->lines.begin(); l != drag->lines.end() && (!over_line); ++l) { line = (SPCtrlCurve*) (*l); over_line |= sp_mesh_context_is_over_line (this, (SPItem*) line, Geom::Point(event->motion.x, event->motion.y)); } @@ -594,7 +594,7 @@ bool MeshTool::root_handler(GdkEvent* event) { bool over_line = false; if (!drag->lines.empty()) { - for (std::vector<SPCtrlLine *>::const_iterator l = drag->lines.begin(); l != drag->lines.end() ; l++) { + for (std::vector<SPCtrlLine *>::const_iterator l = drag->lines.begin(); l != drag->lines.end() ; ++l) { over_line |= sp_mesh_context_is_over_line (this, (SPItem*)(*l), Geom::Point(event->motion.x, event->motion.y)); } } @@ -625,7 +625,7 @@ bool MeshTool::root_handler(GdkEvent* event) { SPCtrlLine *line = NULL; if (!drag->lines.empty()) { - for (std::vector<SPCtrlLine *>::const_iterator l = drag->lines.begin(); l != drag->lines.end() && (!over_line); l++) { + for (std::vector<SPCtrlLine *>::const_iterator l = drag->lines.begin(); l != drag->lines.end() && (!over_line); ++l) { line = (SPCtrlLine*)(*l); over_line = sp_mesh_context_is_over_line (this, (SPItem*) line, Geom::Point(event->motion.x, event->motion.y)); diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 2b85216d2..905e38f2b 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -405,13 +405,15 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele // Find next item and activate it std::vector<SPItem *>::iterator next = this->cycling_cur_item; if (scroll_event->direction == GDK_SCROLL_UP) { - next++; - if (next == this->cycling_items.end() && this->cycling_wrap) + ++next; + if (next == this->cycling_items.end() && this->cycling_wrap) { next = this->cycling_items.begin(); + } } else { - if(next == this->cycling_items.begin()) + if(next == this->cycling_items.begin()) { next = this->cycling_items.end(); - next--; + } + --next; } if (next!=this->cycling_items.end()) { |