diff options
| author | Roman Hargrave <roman@hargrave.info> | 2017-08-02 04:36:35 +0000 |
|---|---|---|
| committer | Roman Hargrave <roman@hargrave.info> | 2017-08-02 04:36:35 +0000 |
| commit | 9effcd14d43c414234b71ffb92577c4458eed545 (patch) | |
| tree | 89777c607dfe9f87b53df956ada807c9ba11ce40 /src | |
| parent | Change HSL scaling for color chooser (diff) | |
| download | inkscape-9effcd14d43c414234b71ffb92577c4458eed545.tar.gz inkscape-9effcd14d43c414234b71ffb92577c4458eed545.zip | |
Rename SP_COLOR_SCALES_MODE_HSV to SP_COLOR_SCALES_MODE_HSL
SP_COLOR_SCALES_MODE_HSV was a bad name for HSL selection mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/color-notebook.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/color-scales.cpp | 14 | ||||
| -rw-r--r-- | src/ui/widget/color-scales.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index 0c9402c99..3be6ca3f4 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -58,7 +58,7 @@ ColorNotebook::ColorNotebook(SelectedColor &color) page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_RGB), true); _available_pages.push_back(page); - page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_HSV), true); + page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_HSL), true); _available_pages.push_back(page); page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_CMYK), true); _available_pages.push_back(page); diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 3d02f648f..42c710c4c 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -164,7 +164,7 @@ void ColorScales::_recalcColor() switch (_mode) { case SP_COLOR_SCALES_MODE_RGB: - case SP_COLOR_SCALES_MODE_HSV: + case SP_COLOR_SCALES_MODE_HSL: _getRgbaFloatv(c); color.set(c[0], c[1], c[2]); alpha = c[3]; @@ -204,7 +204,7 @@ void ColorScales::_updateDisplay() c[3] = _color.alpha(); c[4] = 0.0; break; - case SP_COLOR_SCALES_MODE_HSV: + case SP_COLOR_SCALES_MODE_HSL: sp_color_get_rgb_floatv(&color, tmp); sp_color_rgb_to_hsl_floatv(c, tmp[0], tmp[1], tmp[2]); c[3] = _color.alpha(); @@ -276,7 +276,7 @@ void ColorScales::_getRgbaFloatv(gfloat *rgba) rgba[2] = getScaled(_a[2]); rgba[3] = getScaled(_a[3]); break; - case SP_COLOR_SCALES_MODE_HSV: + case SP_COLOR_SCALES_MODE_HSL: sp_color_hsl_to_rgb_floatv(rgba, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2])); rgba[3] = getScaled(_a[3]); break; @@ -301,7 +301,7 @@ void ColorScales::_getCmykaFloatv(gfloat *cmyka) sp_color_rgb_to_cmyk_floatv(cmyka, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2])); cmyka[4] = getScaled(_a[3]); break; - case SP_COLOR_SCALES_MODE_HSV: + case SP_COLOR_SCALES_MODE_HSL: sp_color_hsl_to_rgb_floatv(rgb, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2])); sp_color_rgb_to_cmyk_floatv(cmyka, rgb[0], rgb[1], rgb[2]); cmyka[4] = getScaled(_a[3]); @@ -339,7 +339,7 @@ void ColorScales::setMode(SPColorScalesMode mode) if (_mode == mode) return; - if ((_mode == SP_COLOR_SCALES_MODE_RGB) || (_mode == SP_COLOR_SCALES_MODE_HSV) || + if ((_mode == SP_COLOR_SCALES_MODE_RGB) || (_mode == SP_COLOR_SCALES_MODE_HSL) || (_mode == SP_COLOR_SCALES_MODE_CMYK)) { _getRgbaFloatv(rgba); } @@ -376,7 +376,7 @@ void ColorScales::setMode(SPColorScalesMode mode) _updateSliders(CSC_CHANNELS_ALL); _updating = FALSE; break; - case SP_COLOR_SCALES_MODE_HSV: + case SP_COLOR_SCALES_MODE_HSL: _setRangeLimit(100.0); gtk_label_set_markup_with_mnemonic(GTK_LABEL(_l[0]), _("_H:")); @@ -533,7 +533,7 @@ void ColorScales::_updateSliders(guint channels) SP_RGBA32_F_COMPOSE(getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 1.0)); } break; - case SP_COLOR_SCALES_MODE_HSV: + case SP_COLOR_SCALES_MODE_HSL: /* Hue is never updated */ if ((channels != CSC_CHANNEL_S) && (channels != CSC_CHANNEL_A)) { /* Update saturation */ diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h index 1e86d762d..2e7f604dc 100644 --- a/src/ui/widget/color-scales.h +++ b/src/ui/widget/color-scales.h @@ -18,7 +18,7 @@ class ColorSlider; typedef enum { SP_COLOR_SCALES_MODE_NONE = 0, SP_COLOR_SCALES_MODE_RGB = 1, - SP_COLOR_SCALES_MODE_HSV = 2, + SP_COLOR_SCALES_MODE_HSL = 2, SP_COLOR_SCALES_MODE_CMYK = 3 } SPColorScalesMode; |