diff options
| author | Geoff Lankow <geoff@darktrojan.net> | 2018-03-25 07:39:59 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-05-09 12:23:00 +0000 |
| commit | 83c8ece517ffc7cbfcb9b2493147e61606e5efc8 (patch) | |
| tree | ebefa91024a26b70d1623777b6bd7c2dc3382381 /src/live_effects/parameter | |
| parent | Revert "Fix include order with clang-tidy check llvm-include-order" (diff) | |
| download | inkscape-83c8ece517ffc7cbfcb9b2493147e61606e5efc8.tar.gz inkscape-83c8ece517ffc7cbfcb9b2493147e61606e5efc8.zip | |
Create and use LabelledColorPicker widget
Diffstat (limited to 'src/live_effects/parameter')
| -rw-r--r-- | src/live_effects/parameter/colorpicker.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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<Gtk::Widget *> (label), true, true); hbox->pack_start(*dynamic_cast<Gtk::Widget *> (colorpickerwdg), true, true); return dynamic_cast<Gtk::Widget *> (hbox); } |