diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-04-26 20:52:21 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-04-26 20:52:21 +0000 |
| commit | acc0481ab26cea622e11d16ae0979b00f86b4261 (patch) | |
| tree | c32b4f65ea7091b6ba940d4f4b6cca7ccc87ea08 /src | |
| parent | Stop crash on binary path division (flatpak) (diff) | |
| download | inkscape-acc0481ab26cea622e11d16ae0979b00f86b4261.tar.gz inkscape-acc0481ab26cea622e11d16ae0979b00f86b4261.zip | |
Show items selected by unhandled selectors
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/selectordialog.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/ui/dialog/selectordialog.cpp b/src/ui/dialog/selectordialog.cpp index 3db239933..ce9bf3893 100644 --- a/src/ui/dialog/selectordialog.cpp +++ b/src/ui/dialog/selectordialog.cpp @@ -485,16 +485,14 @@ void SelectorDialog::_readStyleElement() row[_mColumns._colType] = colType; row[_mColumns._colObj] = objVec; row[_mColumns._colProperties] = properties; - if (colType == SELECTOR) { - // Add as children, objects that match selector. - for (auto &obj : objVec) { - Gtk::TreeModel::Row childrow = *(_store->append(row->children())); - childrow[_mColumns._colSelector] = "#" + Glib::ustring(obj->getId()); - childrow[_mColumns._colExpand] = false; - childrow[_mColumns._colType] = OBJECT; - childrow[_mColumns._colObj] = std::vector<SPObject *>(1, obj); - childrow[_mColumns._colProperties] = ""; // Unused - } + // Add as children, objects that match selector. + for (auto &obj : objVec) { + Gtk::TreeModel::Row childrow = *(_store->append(row->children())); + childrow[_mColumns._colSelector] = "#" + Glib::ustring(obj->getId()); + childrow[_mColumns._colExpand] = false; + childrow[_mColumns._colType] = colType == UNHANDLED?UNHANDLED:OBJECT; + childrow[_mColumns._colObj] = std::vector<SPObject *>(1, obj); + childrow[_mColumns._colProperties] = ""; // Unused } } _updating = false; @@ -693,6 +691,9 @@ void SelectorDialog::_removeFromSelector(Gtk::TreeModel::Row row) if (*row) { Glib::ustring objectLabel = row[_mColumns._colSelector]; + if (row[_mColumns._colType] == UNHANDLED) { + return; + }; Gtk::TreeModel::iterator iter = row->parent(); if (iter) { Gtk::TreeModel::Row parent = *iter; |