From 8b04d0db6c55e36935690d37defb6f9b68945796 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 05:40:36 +0000 Subject: SPDocument->Document (bzr r8404) --- src/desktop.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 6b7c20094..4f832682d 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -178,7 +178,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas) namedview = nv; canvas = aCanvas; - SPDocument *document = SP_OBJECT_DOCUMENT (namedview); + Document *document = SP_OBJECT_DOCUMENT (namedview); /* Kill flicker */ sp_document_ensure_up_to_date (document); @@ -577,7 +577,7 @@ SPDesktop::activate_guides(bool activate) * Make desktop switch documents. */ void -SPDesktop::change_document (SPDocument *theDocument) +SPDesktop::change_document (Document *theDocument) { g_return_if_fail (theDocument != NULL); @@ -1492,7 +1492,7 @@ SPDesktop::updateCanvasNow() * Associate document with desktop. */ void -SPDesktop::setDocument (SPDocument *doc) +SPDesktop::setDocument (Document *doc) { if (this->doc() && doc) { namedview->hide(this); -- cgit v1.2.3 From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 6 Aug 2009 14:17:17 +0000 Subject: Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily. (bzr r8422) --- src/desktop.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 4f832682d..6b7c20094 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -178,7 +178,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas) namedview = nv; canvas = aCanvas; - Document *document = SP_OBJECT_DOCUMENT (namedview); + SPDocument *document = SP_OBJECT_DOCUMENT (namedview); /* Kill flicker */ sp_document_ensure_up_to_date (document); @@ -577,7 +577,7 @@ SPDesktop::activate_guides(bool activate) * Make desktop switch documents. */ void -SPDesktop::change_document (Document *theDocument) +SPDesktop::change_document (SPDocument *theDocument) { g_return_if_fail (theDocument != NULL); @@ -1492,7 +1492,7 @@ SPDesktop::updateCanvasNow() * Associate document with desktop. */ void -SPDesktop::setDocument (Document *doc) +SPDesktop::setDocument (SPDocument *doc) { if (this->doc() && doc) { namedview->hide(this); -- cgit v1.2.3 From ac652771931c1730c623848c75e8cbdd3f9fde84 Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Sun, 23 Aug 2009 19:56:43 +0000 Subject: - fix bug #414142 (Moving path nodes twice is hard when snap is enabled) - constrained snap: use projected point to calculate the snap distance (bzr r8526) --- src/desktop.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 6b7c20094..8c070786e 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -226,11 +226,18 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas) setDisplayModeNormal(); } + // The order in which these canvas items are added determines the z-order. It's therefore + // important to add the tempgroup (which will contain the snapindicator) before adding the + // controls. Only this way one will be able to quickly (before the snap indicator has + // disappeared) reselect a node after snapping it. If the z-order is wrong however, this + // will not work (the snap indicator is on top of the node handler; is the snapindicator + // being selected? or does it intercept some of the events that should have gone to the + // node handler? see bug https://bugs.launchpad.net/inkscape/+bug/414142) gridgroup = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); guides = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); sketch = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); - controls = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); tempgroup = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); + controls = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); /* Push select tool to the bottom of stack */ /** \todo -- cgit v1.2.3 From f5fbb47d99b74312c44ad16734ca0dbdf9bcf968 Mon Sep 17 00:00:00 2001 From: Josh Andler Date: Mon, 21 Sep 2009 20:58:04 +0000 Subject: Patch by Adib for 238796 (bzr r8626) --- src/desktop.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 8c070786e..f7ef1a8cd 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -148,7 +148,6 @@ SPDesktop::SPDesktop() : _layer_hierarchy( 0 ), _reconstruction_old_layer_id( 0 ), _display_mode(Inkscape::RENDERMODE_NORMAL), - _saved_display_mode(Inkscape::RENDERMODE_NORMAL), _widget( 0 ), _inkscape( 0 ), _guides_message_context( 0 ), @@ -444,18 +443,21 @@ void SPDesktop::_setDisplayMode(Inkscape::RenderMode mode) { SP_CANVAS_ARENA (drawing)->arena->rendermode = mode; canvas->rendermode = mode; _display_mode = mode; - if (mode != Inkscape::RENDERMODE_OUTLINE) { - _saved_display_mode = _display_mode; - } sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw _widget->setTitle(SP_DOCUMENT_NAME(sp_desktop_document(this))); } void SPDesktop::displayModeToggle() { - if (_display_mode == Inkscape::RENDERMODE_OUTLINE) { - _setDisplayMode(_saved_display_mode); - } else { + switch (_display_mode) { + case Inkscape::RENDERMODE_NORMAL: + _setDisplayMode(Inkscape::RENDERMODE_NO_FILTERS); + break; + case Inkscape::RENDERMODE_NO_FILTERS: _setDisplayMode(Inkscape::RENDERMODE_OUTLINE); + break; + case Inkscape::RENDERMODE_OUTLINE: + default: + _setDisplayMode(Inkscape::RENDERMODE_NORMAL); } } -- cgit v1.2.3 From 41bb684f180db264ed37af7d58ef12079a582250 Mon Sep 17 00:00:00 2001 From: bulia byak Date: Sun, 25 Oct 2009 02:48:06 +0000 Subject: remove registerEditWidget, move this to SPDesktop::init instead; a noop change but fixes a weird crash on Windows (bzr r8805) --- src/desktop.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index f7ef1a8cd..319a0d407 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -164,8 +164,10 @@ SPDesktop::SPDesktop() : } void -SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas) +SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWidgetInterface *widget) { + _widget = widget; + // Temporary workaround for link order issues: Inkscape::DeviceManager::getManager().getDevices(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); -- cgit v1.2.3