diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-03-22 00:44:33 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-03-22 00:44:33 +0000 |
| commit | 6cf21902eb05d2d47b16b45b8419be4dcd1a35ff (patch) | |
| tree | b0208578c0b6e402910f580b0285db4e12015624 /src/ui/widget | |
| parent | Fix crash (diff) | |
| download | inkscape-6cf21902eb05d2d47b16b45b8419be4dcd1a35ff.tar.gz inkscape-6cf21902eb05d2d47b16b45b8419be4dcd1a35ff.zip | |
C++-ification of paint selector.
(bzr r9221)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/color-picker.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp index d6ae50ae3..34cf1d5e3 100644 --- a/src/ui/widget/color-picker.cpp +++ b/src/ui/widget/color-picker.cpp @@ -116,12 +116,15 @@ ColorPicker::on_changed (guint32) void sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp) { - if (_in_use) return; - else _in_use = true; + if (_in_use) { + return; + } else { + _in_use = true; + } SPColor color; - float alpha; - csel->base->getColorAlpha(color, &alpha); + float alpha = 0; + csel->base->getColorAlpha(color, alpha); guint32 rgba = color.toRGBA32( alpha ); ColorPicker *ptr = (ColorPicker *)(cp); |