diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-10-30 06:16:09 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-10-30 06:16:09 +0000 |
| commit | beba10dbc4c2fd0f2dcbe482fdb657cbe4e3598e (patch) | |
| tree | 92c014fcaab5353cb6abc7276c819abe3fa96620 /src/widgets/sp-color-notebook.cpp | |
| parent | Moving functionality into <color-profile> (diff) | |
| download | inkscape-beba10dbc4c2fd0f2dcbe482fdb657cbe4e3598e.tar.gz inkscape-beba10dbc4c2fd0f2dcbe482fdb657cbe4e3598e.zip | |
Cleanup on color changers
(bzr r3972)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index 44d6b3799..b7ec3eb2c 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -418,21 +418,15 @@ SPColorSelector* ColorNotebook::getCurrentSelector() return csel; } -void ColorNotebook::_colorChanged(const SPColor& color, gfloat alpha) +void ColorNotebook::_colorChanged() { - SPColorSelector* cselPage = 0; - - g_return_if_fail (_csel != NULL); - g_return_if_fail (SP_IS_COLOR_NOTEBOOK (_csel)); - g_return_if_fail( ( 0.0 <= alpha ) && ( alpha <= 1.0 ) ); - - cselPage = getCurrentSelector(); - if ( cselPage ) - { - cselPage->base->setColorAlpha( color, alpha ); - } + SPColorSelector* cselPage = getCurrentSelector(); + if ( cselPage ) + { + cselPage->base->setColorAlpha( _color, _alpha ); + } - _updateRgbaEntry( color, alpha ); + _updateRgbaEntry( _color, _alpha ); } void ColorNotebook::_rgbaEntryChangedHook(GtkEntry *entry, SPColorNotebook *colorbook) @@ -624,3 +618,14 @@ void ColorNotebook::removePage( GType page_type, guint submode ) } } } + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : |