Merge branch 'BetterGoToDateAndHour' into quivr-master

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

Author: Jens Claes

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

@@ -452,14 +452,19 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
         Calendar today = today();
 
         if (mAreDimensionsInvalid) {
-            mAreDimensionsInvalid = false;
             mEffectiveMinHourHeight= Math.max(mMinHourHeight, (int) ((getHeight() - mHeaderTextHeight - mHeaderRowPadding * 2 - mHeaderMarginBottom) / 24));
 
-            double scrollToHour = mScrollToHour;
+            mAreDimensionsInvalid = false;
             if(mScrollToDay != null)
                 goToDate(mScrollToDay);
-            if(scrollToHour >= 0)
-                goToHour(scrollToHour);
+
+            mAreDimensionsInvalid = false;
+            if(mScrollToHour >= 0)
+                goToHour(mScrollToHour);
+
+            mScrollToDay = null;
+            mScrollToHour = -1;
+            mAreDimensionsInvalid = false;
         }
         if (mIsFirstDraw){
             mIsFirstDraw = false;
@@ -1031,8 +1036,6 @@ private boolean isTimeAfterOrEquals(Calendar time1, Calendar time2) {
     public void invalidate() {
         super.invalidate();
         mAreDimensionsInvalid = true;
-        mScrollToDay = null;
-        mScrollToHour = -1;
     }
 
     /////////////////////////////////////////////////////////////////