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/ui/widget/registered-widget.cpp | |
| 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/ui/widget/registered-widget.cpp')
| -rw-r--r-- | src/ui/widget/registered-widget.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 753b72c2e..d539cdcc5 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -365,13 +365,10 @@ RegisteredColorPicker::RegisteredColorPicker(const Glib::ustring& label, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in) - : RegisteredWidget<ColorPicker> (title, tip, 0, true) + : RegisteredWidget<LabelledColorPicker> (label, title, tip, 0, true) { init_parent("", wr, repr_in, doc_in); - _label = new Gtk::Label (label, Gtk::ALIGN_END); - _label->set_use_underline (true); - _label->set_mnemonic_widget (*this); _ckey = ckey; _akey = akey; _changed_connection = connectChanged (sigc::mem_fun (*this, &RegisteredColorPicker::on_changed)); @@ -385,13 +382,13 @@ RegisteredColorPicker::~RegisteredColorPicker() void RegisteredColorPicker::setRgba32 (guint32 rgba) { - ColorPicker::setRgba32 (rgba); + LabelledColorPicker::setRgba32 (rgba); } void RegisteredColorPicker::closeWindow() { - ColorPicker::closeWindow(); + LabelledColorPicker::closeWindow(); } void |