From d128fc4fd60ebcd8ac820f584b5a4b3b35ad5b00 Mon Sep 17 00:00:00 2001
From: Tomasz Boczkowski <penginsbacon@gmail.com>
Date: Sat, 31 May 2014 20:15:08 +0200
Subject: SPColorScales c++-sification - using SelectedColor

(bzr r13341.6.40)
---
 src/widgets/sp-color-notebook.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/widgets/sp-color-notebook.cpp')

diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 0e1634314..807fe38e0 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -455,7 +455,9 @@ ColorNotebook::Page::Page(Inkscape::UI::ColorSelectorFactory *selector_factory,
 
 void ColorNotebook::_colorChanged()
 {
+    _updating = true;
     _selected_color.setColorAlpha(_color, _alpha, true);
+    _updating = false;
 
     SPColorSelector* cselPage = getCurrentSelector();
     if ( cselPage )
@@ -613,13 +615,13 @@ void ColorNotebook::_onSelectedColorDragged() {
     }
     bool oldState = _dragging;
 
-    _dragging = TRUE;
+    _dragging = true;
     SPColor color;
     gfloat alpha = 1.0;
 
     _updating = true;
     _selected_color.colorAlpha(color, alpha);
-    _updateInternals(color, alpha, _dragging);
+    _updateInternals(color, alpha, true);
     _updating = false;
 
     _dragging = oldState;
-- 
cgit v1.2.3