diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-12-01 16:07:55 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-12-01 16:17:15 +0000 |
| commit | c4c77d4826cabf2d41e8614225609427f57fa1f4 (patch) | |
| tree | 0a40b9be68336b3cd7be2f112414dcbd4157b292 /src/display/drawing-item.cpp | |
| parent | Add scrool insensitive and reset if desktop change size (diff) | |
| download | inkscape-c4c77d4826cabf2d41e8614225609427f57fa1f4.tar.gz inkscape-c4c77d4826cabf2d41e8614225609427f57fa1f4.zip | |
Fix merge to master and add shortcut
Diffstat (limited to 'src/display/drawing-item.cpp')
| -rw-r--r-- | src/display/drawing-item.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index d3729da94..922576ec5 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -121,7 +121,7 @@ DrawingItem::DrawingItem(Drawing &drawing) , _fill_pattern(nullptr) , _stroke_pattern(nullptr) , _filter(nullptr) - , _item(nullptr) + , _user_data(nullptr) , _cache(nullptr) , _state(0) , _child_type(CHILD_ORPHAN) @@ -1031,9 +1031,10 @@ DrawingItem::pick(Geom::Point const &p, double delta, unsigned flags) Glib::ustring DrawingItem::name() { - if (_item) { - if (_item->getId()) - return _item->getId(); + SPObject *object = static_cast<SPObject *>(_user_data); + if (object) { + if(object->getId()) + return object->getId(); else return "No object id"; } else { |