From c2b99414ee441654e641552f372ebf1165f94ffc Mon Sep 17 00:00:00 2001
From: Tomasz Boczkowski <penginsbacon@gmail.com>
Date: Sat, 31 May 2014 12:34:20 +0200
Subject: SPColorWheelSelector c++-sification: inherit Gtk::Table/Grid

(bzr r13341.6.35)
---
 src/ui/selected-color.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/ui/selected-color.cpp')

diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp
index 1be171a6b..10ca68b21 100644
--- a/src/ui/selected-color.cpp
+++ b/src/ui/selected-color.cpp
@@ -16,6 +16,8 @@
 #include <cmath>
 #include <glib.h>
 
+#include "svg/svg-icc-color.h"
+
 namespace Inkscape {
 namespace UI {
 
@@ -24,8 +26,8 @@ double const SelectedColor::_EPSILON = 1e-4;
 SelectedColor::SelectedColor()
 	: _color(0)
     , _alpha(1.0)
-    , _virgin(true)
     , _held(false)
+    , _virgin(true)
 {
 
 }
@@ -36,7 +38,7 @@ SelectedColor::~SelectedColor() {
 
 void SelectedColor::setColor(SPColor const &color)
 {
-    setColorAlpha( color, _alpha );
+    setColorAlpha( color, _alpha, true);
 }
 
 SPColor SelectedColor::color() const
@@ -47,7 +49,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
@@ -111,9 +113,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;
+}
+
 }
 }
 
-- 
cgit v1.2.3