From 368af42b94093b215ecbf805d36f9ab3849a3f36 Mon Sep 17 00:00:00 2001 From: John Smith Date: Sun, 5 Aug 2012 15:50:05 +0900 Subject: Fix for 427514 : Fix mirroring of FS Opacity/Blur settings (bzr r11590) --- src/ui/widget/object-composite-settings.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/ui/widget/object-composite-settings.cpp') diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 09fe53b31..1cb384501 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -37,8 +37,8 @@ namespace Inkscape { namespace UI { namespace Widget { -void ObjectCompositeSettings::_on_desktop_activate( - Inkscape::Application */*application*/, +/*void ObjectCompositeSettings::_on_desktop_activate( + Inkscape::Application *application, SPDesktop *desktop, ObjectCompositeSettings *w ) { @@ -48,14 +48,14 @@ void ObjectCompositeSettings::_on_desktop_activate( } void ObjectCompositeSettings::_on_desktop_deactivate( - Inkscape::Application */*application*/, - SPDesktop */*desktop*/, + Inkscape::Application *application, + SPDesktop *desktop, ObjectCompositeSettings *w ) { if (w->_subject) { w->_subject->setDesktop(NULL); } -} +}*/ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char const *history_prefix, int flags) : _verb_code(verb_code), @@ -109,8 +109,9 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co show_all_children(); - _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this ); - _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_deactivate), this ); + // These signals dont properly detect change in desktop, rely on owner dialog to call setSubject() from setTargetDesktop() + //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this ); + //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_deactivate), this ); } ObjectCompositeSettings::~ObjectCompositeSettings() { -- cgit v1.2.3