minor bugfixing

(bzr r15620.1.13)

4 files changed, 19 insertions, 13 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 37694f32f..22cc5567b 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -795,17 +795,15 @@ Effect::defaultParamSet()
     // use manage here, because after deletion of Effect object, others might still be pointing to this widget.
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox() );
-
-    vbox->set_border_width(5);
     Gtk::VBox * vbox_expander = Gtk::manage( new Gtk::VBox() );
-    vbox_expander->set_border_width(10);
-    vbox_expander->set_spacing(2);
     Glib::ustring effectname = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_label(effectType());
     Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(effectType());
     std::vector<Parameter *>::iterator it = param_vector.begin();
     Inkscape::UI::Widget::Registry * wr;
+    bool has_params = false;
     while (it != param_vector.end()) {
         if ((*it)->widget_is_visible) {
+            has_params = true;
             Parameter * param = *it;
             Glib::ustring * tip = param->param_getTooltip();
             const gchar * key = param->param_key.c_str();
@@ -843,13 +841,17 @@ Effect::defaultParamSet()
         }
         ++it;
     }
-    Glib::ustring tip = "<b>" + effectname + (Glib::ustring)_("</b>: Set default parameters to current values");
+    Glib::ustring tip = "<b>" + effectname + (Glib::ustring)_("</b>: Set default parameters");
     Gtk::Expander * expander = Gtk::manage(new Gtk::Expander(tip));
     expander->set_use_markup(true);
     expander->add(*vbox_expander);
     expander->set_expanded(false);
     vbox->pack_start(*dynamic_cast<Gtk::Widget *> (expander), true, true, 2);
-    return dynamic_cast<Gtk::Widget *>(vbox);
+    if (has_params) {
+        return dynamic_cast<Gtk::Widget *>(vbox);
+    } else {
+        return NULL;
+    }
 }
 
 void
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index 1423e670a..5c227e68a 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -86,7 +86,7 @@ Gtk::Widget *LPEBSpline::newWidget()
     // use manage here, because after deletion of Effect object, others might
     // still be pointing to this widget.
     Gtk::VBox *vbox = Gtk::manage(new Gtk::VBox(Effect::newWidget()));
-
+    vbox->set_homogeneous(false);
     vbox->set_border_width(5);
     std::vector<Parameter *>::iterator it = param_vector.begin();
     while (it != param_vector.end()) {
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 15c81d543..e35c89c09 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -91,6 +91,7 @@ ScalarParam::param_getSVGValue() const
 {
     Inkscape::SVGOStringStream os;
     os << value;
+    std::cout << value << "value\n";
     gchar * str = g_strdup(os.str().c_str());
     return str;
 }
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 455c12bc3..f0ccce6d4 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -194,12 +194,15 @@ LivePathEffectEditor::showParams(LivePathEffect::Effect& effect)
         return;
     }
     bool expanderopen = false;
+    Gtk::Widget * defaultswidget = effect.defaultParamSet();
     if (effectwidget) {
-        Gtk::Expander * expander = NULL;
-        std::vector<Gtk::Widget *> childs = dynamic_cast<Gtk::Box *> (effectwidget)->get_children();
-        std::vector<Gtk::Widget *> childs_default = dynamic_cast<Gtk::Box *> (childs[childs.size()-1])->get_children();
-        if ((expander = dynamic_cast<Gtk::Expander *>(childs_default[childs_default.size()-1]))){
-            expanderopen = expander->get_expanded();
+         if (defaultswidget) {
+            Gtk::Expander * expander = NULL;
+            std::vector<Gtk::Widget *> childs = dynamic_cast<Gtk::Box *> (effectwidget)->get_children();
+            std::vector<Gtk::Widget *> childs_default = dynamic_cast<Gtk::Box *> (childs[childs.size()-1])->get_children();
+            if ((expander = dynamic_cast<Gtk::Expander *>(childs_default[childs_default.size()-1]))){
+                expanderopen = expander->get_expanded();
+            }
         }
         effectcontrol_vbox.remove(*effectwidget);
         delete effectwidget;
@@ -210,7 +213,7 @@ LivePathEffectEditor::showParams(LivePathEffect::Effect& effect)
 
     effectwidget = effect.newWidget();
     if (effectwidget) {
-        Gtk::Widget * defaultswidget = effect.defaultParamSet();
+        
         if (defaultswidget) {
             Gtk::Expander * expander = NULL;
             std::vector<Gtk::Widget *> childs_default = dynamic_cast<Gtk::Box *> (defaultswidget)->get_children();