Merge branch 'master' of newton:/data1/x0-0-0/pwr

d2223973 · Claes Sjofors · 31ca8b90 · 9d6dfc1e · d2223973
Commit d2223973 authored May 12, 2016 by Claes Sjofors
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

xtt/lib/xtt/src/xtt_stream.cpp xtt/lib/xtt/src/xtt_stream.cpp +2 -2

No files found.
--- a/xtt/lib/xtt/src/xtt_stream.cpp
+++ b/xtt/lib/xtt/src/xtt_stream.cpp
@@ -207,9 +207,9 @@ void XttStream::action_scroll( int direction, int x, int y, int cnt)
  double zoom;
  if ( direction)
-    zoom = - cnt * 4;
-  else
    zoom = cnt * 4;
+  else
+    zoom = - cnt * 4;
  camera_control->zoom_relative( zoom);
 }