From 83c8ece517ffc7cbfcb9b2493147e61606e5efc8 Mon Sep 17 00:00:00 2001 From: Geoff Lankow Date: Sun, 25 Mar 2018 20:39:59 +1300 Subject: Create and use LabelledColorPicker widget --- src/live_effects/parameter/colorpicker.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/live_effects/parameter') diff --git a/src/live_effects/parameter/colorpicker.cpp b/src/live_effects/parameter/colorpicker.cpp index f6521d0c0..d4ebdaa1c 100644 --- a/src/live_effects/parameter/colorpicker.cpp +++ b/src/live_effects/parameter/colorpicker.cpp @@ -105,7 +105,7 @@ ColorPickerParam::param_newWidget() hbox->set_border_width(5); hbox->set_homogeneous(false); hbox->set_spacing(2); - Inkscape::UI::Widget::RegisteredColorPicker * colorpickerwdg = Gtk::manage( + Inkscape::UI::Widget::RegisteredColorPicker * colorpickerwdg = new Inkscape::UI::Widget::RegisteredColorPicker( param_label, param_label, param_tooltip, @@ -113,17 +113,13 @@ ColorPickerParam::param_newWidget() param_key + "_opacity_LPE", *param_wr, param_effect->getRepr(), - param_effect->getSPDoc() ) ); - Gtk::Label * label = new Gtk::Label (param_label, Gtk::ALIGN_END); - label->set_use_underline (true); - label->set_mnemonic_widget (*colorpickerwdg); + param_effect->getSPDoc() ); SPDocument *document = SP_ACTIVE_DOCUMENT; bool saved = DocumentUndo::getUndoSensitive(document); DocumentUndo::setUndoSensitive(document, false); colorpickerwdg->setRgba32(value); DocumentUndo::setUndoSensitive(document, saved); colorpickerwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change color button parameter")); - hbox->pack_start(*dynamic_cast (label), true, true); hbox->pack_start(*dynamic_cast (colorpickerwdg), true, true); return dynamic_cast (hbox); } -- cgit v1.2.3