DPF

commit f333c7a90c664458d41828e8c2489e2e95ed5607
parent c689d18ffa3059ba12cea7a4f883525edae0d500
Author: falkTX <falktx@gmail.com>
Date:   Sun, 25 May 2014 00:17:31 +0100

Cleanup

Diffstat:
M
dgl/src/ImageKnob.cpp
 | 
16
++++++----------
M
dgl/src/ImageSlider.cpp
 | 
12
++++--------

2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/dgl/src/ImageKnob.cpp b/dgl/src/ImageKnob.cpp
@@ -353,7 +353,7 @@ bool ImageKnob::onMotion(const MotionEvent& ev)
     {
         if (const int movX = ev.pos.getX() - fLastX)
         {
-            d     = (ev.mod & MODIFIER_SHIFT) ? 2000.0f : 200.0f;
+            d     = (ev.mod & MODIFIER_CTRL) ? 2000.0f : 200.0f;
             value = fValueTmp + (float(fMaximum - fMinimum) / d * float(movX));
             doVal = true;
         }
@@ -362,7 +362,7 @@ bool ImageKnob::onMotion(const MotionEvent& ev)
     {
         if (const int movY = fLastY - ev.pos.getY())
         {
-            d     = (ev.mod & MODIFIER_SHIFT) ? 2000.0f : 200.0f;
+            d     = (ev.mod & MODIFIER_CTRL) ? 2000.0f : 200.0f;
             value = fValueTmp + (float(fMaximum - fMinimum) / d * float(movY));
             doVal = true;
         }
@@ -373,13 +373,11 @@ bool ImageKnob::onMotion(const MotionEvent& ev)
 
     if (value < fMinimum)
     {
-        value = fMinimum;
-        fValueTmp = value;
+        fValueTmp = value = fMinimum;
     }
     else if (value > fMaximum)
     {
-        value = fMaximum;
-        fValueTmp = value;
+        fValueTmp = value = fMaximum;
     }
     else if (fStep != 0.0f)
     {
@@ -406,13 +404,11 @@ bool ImageKnob::onScroll(const ScrollEvent& ev)
 
     if (value < fMinimum)
     {
-        value = fMinimum;
-        fValueTmp = value;
+        fValueTmp = value = fMinimum;
     }
     else if (value > fMaximum)
     {
-        value = fMaximum;
-        fValueTmp = value;
+        fValueTmp = value = fMaximum;
     }
     else if (fStep != 0.0f)
     {
diff --git a/dgl/src/ImageSlider.cpp b/dgl/src/ImageSlider.cpp
@@ -256,13 +256,11 @@ bool ImageSlider::onMouse(const MouseEvent& ev)
 
         if (value < fMinimum)
         {
-            value = fMinimum;
-            fValueTmp = value;
+            fValueTmp = value = fMinimum;
         }
         else if (value > fMaximum)
         {
-            value = fMaximum;
-            fValueTmp = value;
+            fValueTmp = value = fMaximum;
         }
         else if (fStep != 0.0f)
         {
@@ -327,13 +325,11 @@ bool ImageSlider::onMotion(const MotionEvent& ev)
 
         if (value < fMinimum)
         {
-            value = fMinimum;
-            fValueTmp = value;
+            fValueTmp = value = fMinimum;
         }
         else if (value > fMaximum)
         {
-            value = fMaximum;
-            fValueTmp = value;
+            fValueTmp = value = fMaximum;
         }
         else if (fStep != 0.0f)
         {