diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 10:17:43 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 10:17:43 +0000 |
| commit | 82b3868737f8689f61347ab8f0bfef37156f70d4 (patch) | |
| tree | d92049c30a32ca89be4166029f4af3d212121cfc /src/widgets/sp-color-notebook.cpp | |
| parent | merged SPColorWheelSelector c++-sification from svgpaints branch (diff) | |
| parent | SPColorScales c++-sification - using SelectedColor (diff) | |
| download | inkscape-82b3868737f8689f61347ab8f0bfef37156f70d4.tar.gz inkscape-82b3868737f8689f61347ab8f0bfef37156f70d4.zip | |
merged SPColorScales c++-sification from svgpaints branch
(bzr r14059.1.8)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index 0662a54ce..3555844ec 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -34,7 +34,6 @@ #include "../preferences.h" #include "sp-color-notebook.h" #include "spw-utilities.h" -#include "sp-color-scales.h" #include "sp-color-icc-selector.h" #include "svg/svg-icc-color.h" #include "../inkscape.h" @@ -45,6 +44,7 @@ #include "ui/tools-switch.h" #include "ui/tools/tool-base.h" #include "ui/widget/color-entry.h" +#include "ui/widget/color-scales.h" #include "ui/widget/color-wheel-selector.h" using Inkscape::CMSSystem; @@ -448,7 +448,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 ) @@ -606,13 +608,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; |