merge with dev

2019-08-17 06:47:28 +02:00
parent 7a2f5f985e f7ec852e05
commit 7ed4c4422a
27 changed files with 209 additions and 267 deletions
--- a/rtgui/gradient.cc
+++ b/rtgui/gradient.cc
@@ -424,9 +424,7 @@ bool Gradient::button1Pressed(int modifierKey)
            double diagonal = sqrt(double(imW) * double(imW) + double(imH) * double(imH));

            // trick to get the correct angle (clockwise/counter-clockwise)
-            int p = centerPos.y;
-            centerPos.y = currPos.y;
-            currPos.y = p;
+            std::swap(centerPos.y, currPos.y);

            draggedPoint = currPos - centerPos;
            // compute the projected value of the dragged point