SYSclamp32 should not clamp to 0.

ajclinto · Mar 28, 2013 · 9bf423d · 9bf423d
1 parent 3d7750e
commit 9bf423d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Math.h b/Math.h
@@ -54,7 +54,9 @@ inline T SYSclamp(T v, T a, T b)
 }
 inline int SYSclamp32(int64 val)
 {
-    return (int)SYSclamp(val, 0ll, (int64)std::numeric_limits<int>::max());
+    return (int)SYSclamp(val,
+	    (int64)std::numeric_limits<int>::min(),
+	    (int64)std::numeric_limits<int>::max());
 }
 template <typename T>
 inline T SYSlerp(T v1, T v2, T bias)

diff --git a/Window.C b/Window.C
@@ -441,7 +441,7 @@ setScrollMax(QScrollBar *scroll, int64 size, bool with_margin = true)
     int64 nmax = SYSmax(size - scroll->pageStep() + margin, 0ll);
 
     scroll->setMaximum(SYSclamp32(nmax));
-    scroll->setMinimum(-SYSclamp32(margin));
+    scroll->setMinimum(SYSclamp32(-margin));
 }
 
 void