diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-09-15 16:37:27 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-09-15 16:37:27 +0000 |
| commit | c13edab979886a7dc0a23e8bf8b5da77fb5676de (patch) | |
| tree | d0af3cb43043747680e49269441978694656e6f8 /src/extension/paramcolor.cpp | |
| parent | avoid code duplication, i.e. use sp_item_snappoints in the object-snapper.cpp (diff) | |
| download | inkscape-c13edab979886a7dc0a23e8bf8b5da77fb5676de.tar.gz inkscape-c13edab979886a7dc0a23e8bf8b5da77fb5676de.zip | |
Refactoring SPColor to C++ and removing legacy CMYK implementation
(bzr r3753)
Diffstat (limited to 'src/extension/paramcolor.cpp')
| -rw-r--r-- | src/extension/paramcolor.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/extension/paramcolor.cpp b/src/extension/paramcolor.cpp index e051fc8dc..d31dc907c 100644 --- a/src/extension/paramcolor.cpp +++ b/src/extension/paramcolor.cpp @@ -86,14 +86,13 @@ ParamColor::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::sign { _changeSignal = new sigc::signal<void>(*changeSignal); Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); - SPColorSelector* spColorSelector = (SPColorSelector*)sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK, SP_COLORSPACE_TYPE_RGB); + SPColorSelector* spColorSelector = (SPColorSelector*)sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK); ColorSelector* colorSelector = spColorSelector->base; if (_value < 1) { _value = 0xFF000000; } - SPColor *color = new SPColor(); - sp_color_set_rgb_rgba32(color, _value); + SPColor *color = new SPColor( _value ); float alpha = (_value & 0xff) / 255.0F; colorSelector->setColorAlpha(*color, alpha); @@ -113,7 +112,7 @@ sp_color_param_changed(SPColorSelector *csel, GObject *obj) float alpha = csel->base->getAlpha(); ParamColor* ptr = (ParamColor*)obj; - ptr->set(sp_color_get_rgba32_falpha(&color, alpha), NULL, NULL); + ptr->set(color.toRGBA32( alpha ), NULL, NULL); ptr->_changeSignal->emit(); } |