diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-05-09 19:38:45 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-05-09 19:43:04 +0000 |
| commit | b85b43a64e3d3d7e623b4bcd99b08ef8f6fc7a43 (patch) | |
| tree | 58d4726a94512ba16e15d535b40795ef65cde0c0 /src/ui/tool | |
| parent | fix bug compiling (diff) | |
| download | inkscape-b85b43a64e3d3d7e623b4bcd99b08ef8f6fc7a43.tar.gz inkscape-b85b43a64e3d3d7e623b4bcd99b08ef8f6fc7a43.zip | |
Reset old code to reaply fixed
Diffstat (limited to 'src/ui/tool')
| -rw-r--r-- | src/ui/tool/control-point-selection.h | 5 | ||||
| -rw-r--r-- | src/ui/tool/selectable-control-point.cpp | 9 | ||||
| -rw-r--r-- | src/ui/tool/selectable-control-point.h | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h index d0cfce8d2..ec845b1b3 100644 --- a/src/ui/tool/control-point-selection.h +++ b/src/ui/tool/control-point-selection.h @@ -117,8 +117,6 @@ public: void getOriginalPoints(std::vector<Inkscape::SnapCandidatePoint> &pts); void getUnselectedPoints(std::vector<Inkscape::SnapCandidatePoint> &pts); void setOriginalPoints(); - //the purpose of this list is to keep track of first and last selected - std::list<SelectableControlPoint *> _points_list; private: // The functions below are invoked from SelectableControlPoint. @@ -142,7 +140,8 @@ private: double _rotationRadius(Geom::Point const &); set_type _points; - + //the purpose of this list is to keep track of first and last selected + std::list<SelectableControlPoint *> _points_list; set_type _all_points; INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Point> _original_positions; INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Affine> _last_trans; diff --git a/src/ui/tool/selectable-control-point.cpp b/src/ui/tool/selectable-control-point.cpp index 83ed7d38b..f3f9c0e1e 100644 --- a/src/ui/tool/selectable-control-point.cpp +++ b/src/ui/tool/selectable-control-point.cpp @@ -87,15 +87,6 @@ bool SelectableControlPoint::clicked(GdkEventButton *event) return true; } -void SelectableControlPoint::select(bool toselect) -{ - if (toselect) { - _selection.insert(this); - } else { - _selection.erase(this); - } -} - void SelectableControlPoint::_takeSelection() { _selection.clear(); diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h index c16f639b1..362d4addc 100644 --- a/src/ui/tool/selectable-control-point.h +++ b/src/ui/tool/selectable-control-point.h @@ -28,10 +28,8 @@ public: virtual Geom::Rect bounds() const { return Geom::Rect(position(), position()); } - virtual void select(bool toselect); friend class NodeList; - protected: SelectableControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAnchorType anchor, |
