diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-25 01:06:47 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-25 01:06:47 +0000 |
| commit | 4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3 (patch) | |
| tree | 75853d8eec5e85fb93a2a798b57f072e3c9eeb99 /src/desktop.cpp | |
| parent | Replace direct use of Cairo contexts and surfaces in the rendering tree (diff) | |
| parent | Revert workarounds from 10501 - no longer necessary (diff) | |
| download | inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.tar.gz inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.zip | |
Merge from trunk
(bzr r10347.1.18)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 4ff2716ca..5e968b08b 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -285,7 +285,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid _modified_connection = namedview->connectModified(sigc::bind<2>(sigc::ptr_fun(&_namedview_modified), this)); - NRArenaItem *ai = SP_ITEM(document->getRoot())->invoke_show( + NRArenaItem *ai = document->getRoot()->invoke_show( SP_CANVAS_ARENA (drawing)->arena, dkey, SP_ITEM_SHOW_DISPLAY); @@ -402,7 +402,7 @@ void SPDesktop::destroy() } if (drawing) { - SP_ITEM(doc()->getRoot())->invoke_hide(dkey); + doc()->getRoot()->invoke_hide(dkey); drawing = NULL; } @@ -541,8 +541,9 @@ void SPDesktop::toggleLayerSolo(SPObject *object) { } - if ( SP_ITEM(object)->isHidden() ) { - SP_ITEM(object)->setHidden(false); + SPItem *item = SP_ITEM(object); + if ( item->isHidden() ) { + item->setHidden(false); } for ( std::vector<SPObject*>::iterator it = layers.begin(); it != layers.end(); ++it ) { @@ -1131,7 +1132,7 @@ void SPDesktop::zoom_drawing() { g_return_if_fail (doc() != NULL); - SPItem *docitem = SP_ITEM(doc()->getRoot()); + SPItem *docitem = doc()->getRoot(); g_return_if_fail (docitem != NULL); Geom::OptRect d = docitem->getBboxDesktop(); @@ -1536,7 +1537,7 @@ SPDesktop::setDocument (SPDocument *doc) { if (this->doc() && doc) { namedview->hide(this); - SP_ITEM(this->doc()->getRoot())->invoke_hide(dkey); + this->doc()->getRoot()->invoke_hide(dkey); } if (_layer_hierarchy) { @@ -1567,7 +1568,7 @@ SPDesktop::setDocument (SPDocument *doc) _modified_connection = namedview->connectModified(sigc::bind<2>(sigc::ptr_fun(&_namedview_modified), this)); number = namedview->getViewCount(); - ai = SP_ITEM(doc->getRoot())->invoke_show( + ai = doc->getRoot()->invoke_show( SP_CANVAS_ARENA (drawing)->arena, dkey, SP_ITEM_SHOW_DISPLAY); @@ -1815,8 +1816,7 @@ Geom::Affine SPDesktop::doc2dt() const Geom::Affine SPDesktop::dt2doc() const { - // doc2dt is its own inverse - return _doc2dt; + return _doc2dt.inverse(); } Geom::Point SPDesktop::doc2dt(Geom::Point const &p) const |