diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-02-28 15:50:05 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-02-28 15:50:05 +0000 |
| commit | 1bc1b442d8ec6f394f456c4675d5ca7f6aa1d0d6 (patch) | |
| tree | 0b4c86988abeb6c01b23324f159bd0a8a936f485 /src/ui/tools/dropper-tool.cpp | |
| parent | Improved uri testing (diff) | |
| parent | Spray tool: (diff) | |
| download | inkscape-1bc1b442d8ec6f394f456c4675d5ca7f6aa1d0d6.tar.gz inkscape-1bc1b442d8ec6f394f456c4675d5ca7f6aa1d0d6.zip | |
Merge to trunk
(bzr r13047.1.7)
Diffstat (limited to 'src/ui/tools/dropper-tool.cpp')
| -rw-r--r-- | src/ui/tools/dropper-tool.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 88ed342df..e9e2d6c39 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -72,21 +72,17 @@ const std::string& DropperTool::getPrefsPath() { const std::string DropperTool::prefsPath = "/tools/dropper"; -DropperTool::DropperTool() : ToolBase() { - this->R = 0; - this->G = 0; - this->B = 0; - this->alpha = 0; - this->dragging = false; - - this->grabbed = 0; - this->area = 0; - this->centre = Geom::Point(0, 0); - - this->cursor_shape = cursor_dropper_f_xpm; - this->hot_x = 7; - this->hot_y = 7; - +DropperTool::DropperTool() + : ToolBase(cursor_dropper_f_xpm, 7, 7) + , R(0) + , G(0) + , B(0) + , alpha(0) + , dragging(false) + , grabbed(NULL) + , area(NULL) + , centre(0, 0) +{ cursor_dropper_fill = sp_cursor_new_from_xpm(cursor_dropper_f_xpm , 7, 7); cursor_dropper_stroke = sp_cursor_new_from_xpm(cursor_dropper_s_xpm , 7, 7); } |