liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small code cleanup

Browse Source
This commit is contained in:
Hombre
2016-10-07 12:48:20 +02:00
parent 103091e2c9
commit 1c8d8c6dce
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/lockablecolorpicker.cc
View File

@@ -38,8 +38,8 @@ void LockableColorPicker::updateBackBuffer ()
int newW, newH; int newW, newH;
// -------------------- setting some key constants --------------------- // -------------------- setting some key constants ---------------------
const float circlePadding = 3.f; // keep this value odd constexpr float circlePadding = 3.f; // keep this value odd
const double opacity = 0.62; constexpr double opacity = 0.62;
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
if (validity == Validity::INSIDE) { if (validity == Validity::INSIDE) {
@@ -98,7 +98,7 @@ void LockableColorPicker::updateBackBuffer ()
int maxHRow2 = rtengine::max(h20, h21); int maxHRow2 = rtengine::max(h20, h21);
// -------------------- setting some key constants --------------------- // -------------------- setting some key constants ---------------------
const int textPadding = 3; constexpr int textPadding = 3;
const int textWidth = maxWCol0 + maxWCol1 + textPadding; const int textWidth = maxWCol0 + maxWCol1 + textPadding;
const int textHeight = maxHRow0 + maxHRow1 + maxHRow2 + 2*textPadding; const int textHeight = maxHRow0 + maxHRow1 + maxHRow2 + 2*textPadding;
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@@ -334,7 +334,7 @@ LockableColorPicker::Size LockableColorPicker::getSize ()
void LockableColorPicker::rollDisplayedValues () void LockableColorPicker::rollDisplayedValues ()
{ {
if (displayedValues < ColorPickerType::LAB) { if (displayedValues < ColorPickerType::LAB) {
displayedValues = (ColorPickerType)((int)displayedValues + 1); displayedValues = (ColorPickerType)(rtengine::toUnderlying(displayedValues) + 1);
} else { } else {
displayedValues = ColorPickerType::RGB; displayedValues = ColorPickerType::RGB;
} }
@@ -345,7 +345,7 @@ void LockableColorPicker::rollDisplayedValues ()
bool LockableColorPicker::incSize () bool LockableColorPicker::incSize ()
{ {
if (size < Size::S30) { if (size < Size::S30) {
size = (Size)((int)size + 5); size = (Size)(rtengine::toUnderlying(size) + 5);
setDirty(true); setDirty(true);
return true; return true;
} }
@@ -355,7 +355,7 @@ bool LockableColorPicker::incSize ()
bool LockableColorPicker::decSize () bool LockableColorPicker::decSize ()
{ {
if (size > Size::S5) { if (size > Size::S5) {
size = (Size)((int)size - 5); size = (Size)(rtengine::toUnderlying(size) - 5);
setDirty(true); setDirty(true);
return true; return true;
} }