diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-05-31 18:15:08 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-05-31 18:15:08 +0000 |
| commit | d128fc4fd60ebcd8ac820f584b5a4b3b35ad5b00 (patch) | |
| tree | 638e65f164634c0c376c6a03e07d3a02d142ea87 /src/widgets/sp-color-notebook.cpp | |
| parent | updated CMakeLists (diff) | |
| download | inkscape-d128fc4fd60ebcd8ac820f584b5a4b3b35ad5b00.tar.gz inkscape-d128fc4fd60ebcd8ac820f584b5a4b3b35ad5b00.zip | |
SPColorScales c++-sification - using SelectedColor
(bzr r13341.6.40)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; |