Merge branch 'iss8-vertical-zooming' into quivr-master

Author: Jens Claes

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -393,10 +393,6 @@ public boolean onScaleBegin(ScaleGestureDetector detector) {
             @Override
             public boolean onScale(ScaleGestureDetector detector) {
                 mNewHourHeight = Math.round(mHourHeight * detector.getScaleFactor());
-                if(mNewHourHeight < mEffectiveMinHourHeight)
-                    mNewHourHeight = mEffectiveMinHourHeight;
-                else if(mNewHourHeight > mMaxHourHeight)
-                    mNewHourHeight = mMaxHourHeight;
                 invalidate();
                 return true;
             }
@@ -483,6 +479,11 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
 
         //Calculate the new height due to the zooming.
         if (mNewHourHeight > 0){
+            if(mNewHourHeight < mEffectiveMinHourHeight)
+                mNewHourHeight = mEffectiveMinHourHeight;
+            else if(mNewHourHeight > mMaxHourHeight)
+                mNewHourHeight = mMaxHourHeight;
+
             mCurrentOrigin.y = (mCurrentOrigin.y/mHourHeight)*mNewHourHeight;
             mHourHeight = mNewHourHeight;
             mNewHourHeight = -1;
@@ -1171,7 +1172,7 @@ public int getHourHeight() {
     }
 
     public void setHourHeight(int hourHeight) {
-        mHourHeight = hourHeight;
+        mNewHourHeight = hourHeight;
         invalidate();
     }