diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 09:53:37 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 09:53:37 +0000 |
| commit | ebf464073db4910f559e5661820542bc3ca78a34 (patch) | |
| tree | 061ceb02269b3a1f02e75d594ffcd1fb16f55fad /src/ui/selected-color.cpp | |
| parent | merged SelectedColor enhancements from svgpaints branch (diff) | |
| parent | SPColorWheelSelector c++-sification: replaced gtk calls by gtkmm versions (diff) | |
| download | inkscape-ebf464073db4910f559e5661820542bc3ca78a34.tar.gz inkscape-ebf464073db4910f559e5661820542bc3ca78a34.zip | |
merged SPColorWheelSelector c++-sification from svgpaints branch
(bzr r14059.1.7)
Diffstat (limited to 'src/ui/selected-color.cpp')
| -rw-r--r-- | src/ui/selected-color.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index 440459c74..dff43649c 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -22,6 +22,7 @@ #include <glib.h> #include "selected-color.h" +#include "svg/svg-icc-color.h" namespace Inkscape { namespace UI { @@ -31,8 +32,8 @@ double const SelectedColor::_EPSILON = 1e-4; SelectedColor::SelectedColor() : _color(0) , _alpha(1.0) - , _virgin(true) , _held(false) + , _virgin(true) { } @@ -43,7 +44,7 @@ SelectedColor::~SelectedColor() { void SelectedColor::setColor(SPColor const &color) { - setColorAlpha( color, _alpha ); + setColorAlpha( color, _alpha, true); } SPColor SelectedColor::color() const @@ -54,7 +55,7 @@ SPColor SelectedColor::color() const void SelectedColor::setAlpha(gfloat alpha) { g_return_if_fail( ( 0.0 <= alpha ) && ( alpha <= 1.0 ) ); - setColorAlpha( _color, alpha ); + setColorAlpha( _color, alpha, true); } gfloat SelectedColor::alpha() const @@ -118,9 +119,14 @@ void SelectedColor::setHeld(bool held) { if (released) { signal_released.emit(); + signal_changed.emit(); } } +void SelectedColor::preserveICC() { + _color.icc = _color.icc ? new SVGICCColor(*_color.icc) : 0; +} + } } |