summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/objects.h
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2017-05-23 20:48:47 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2017-05-23 20:48:47 +0000
commitde37ea2c3d4a1c857186dda0b113da04cd2bd79b (patch)
tree4b52381825a1d0efcbe4cada1c4bf61ade04b6a1 /src/ui/dialog/objects.h
parentcmake/MSYS2: Include libyaml for xverb feature (diff)
parentselection chemistry: cancel if we hit top/bottom (diff)
downloadinkscape-de37ea2c3d4a1c857186dda0b113da04cd2bd79b.tar.gz
inkscape-de37ea2c3d4a1c857186dda0b113da04cd2bd79b.zip
merge chr[] branch : Objects panel improvements, mem leaks.
(bzr r15700)
Diffstat (limited to 'src/ui/dialog/objects.h')
-rw-r--r--src/ui/dialog/objects.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h
index 018f9191f..21305669e 100644
--- a/src/ui/dialog/objects.h
+++ b/src/ui/dialog/objects.h
@@ -77,6 +77,9 @@ private:
//Connection for when the document changes
sigc::connection _documentChangedConnection;
+ //Connection for when the active layer changes
+ sigc::connection _documentChangedCurrentLayer;
+
//Connection for when the active selection in the document changes
sigc::connection _selectionChangedConnection;
@@ -216,7 +219,7 @@ private:
bool _checkForUpdated(const Gtk::TreeIter& iter, SPObject* obj);
void _objectsSelected(Selection *sel);
- bool _checkForSelected(const Gtk::TreePath& path, const Gtk::TreeIter& iter, SPItem* item, bool scrollto);
+ bool _checkForSelected(const Gtk::TreePath& path, const Gtk::TreeIter& iter, SPItem* item, bool scrollto, bool expand);
void _objectsChanged(SPObject *obj);
void _addObject( SPObject* obj, Gtk::TreeModel::Row* parentRow );