Merge branch 'pr-278' into develop

Author: Jens Claes

README.md

@@ -96,6 +96,7 @@ Customization
 
 You can customize the look of the `WeekView` in xml. Use the following attributes in xml. All these attributes also have getters and setters to enable you to change the style dynamically.
 
+- `allDayEventHeight`
 - `columnGap`
 - `dayBackgroundColor`
 - `dayNameLength`

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

@@ -140,7 +140,7 @@ private enum Direction {
     private boolean mShowDistinctPastFutureColor = false;
     private boolean mHorizontalFlingEnabled = true;
     private boolean mVerticalFlingEnabled = true;
-    private int mAllDayEventHeight= 100;
+    private int mAllDayEventHeight = 100;
 
     // Listeners.
     private EventClickListener mEventClickListener;
@@ -348,7 +348,7 @@ public WeekView(Context context, AttributeSet attrs, int defStyleAttr) {
             mShowNowLine = a.getBoolean(R.styleable.WeekView_showNowLine, mShowNowLine);
             mHorizontalFlingEnabled = a.getBoolean(R.styleable.WeekView_horizontalFlingEnabled, mHorizontalFlingEnabled);
             mVerticalFlingEnabled = a.getBoolean(R.styleable.WeekView_verticalFlingEnabled, mVerticalFlingEnabled);
-            mAllDayEventHeight = a.getInt(R.styleable.WeekView_allDayEventHeight, mAllDayEventHeight);
+            mAllDayEventHeight = a.getDimensionPixelSize(R.styleable.WeekView_allDayEventHeight, mAllDayEventHeight);
         } finally {
             a.recycle();
         }
@@ -486,9 +486,6 @@ private void initTextTimeWidth() {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        // Hide everything in the first cell (top left corner).
-        canvas.drawRect(0, 0, mTimeTextWidth + mHeaderColumnPadding * 2, mHeaderHeight + mHeaderRowPadding * 2, mHeaderBackgroundPaint);
-
         // Draw the header row.
         drawHeaderRowAndEvents(canvas);
 
@@ -711,6 +708,9 @@ else if (day.before(today)) {
             startPixel += mWidthPerDay + mColumnGap;
         }
 
+        // Hide everything in the first cell (top left corner).
+        canvas.clipRect(0, 0, mTimeTextWidth + mHeaderColumnPadding * 2, mHeaderHeight + mHeaderRowPadding * 2, Region.Op.REPLACE);
+        canvas.drawRect(0, 0, mTimeTextWidth + mHeaderColumnPadding * 2, mHeaderHeight + mHeaderRowPadding * 2, mHeaderBackgroundPaint);
 
         // Clip to paint header row only.
         canvas.clipRect(mHeaderColumnWidth, 0, getWidth(), mHeaderHeight + mHeaderRowPadding * 2, Region.Op.REPLACE);

library/src/main/res/values/attrs.xml

@@ -49,6 +49,6 @@
         <attr name="nowLineThickness" format="dimension"/>
         <attr name="horizontalFlingEnabled" format="boolean"/>
         <attr name="verticalFlingEnabled" format="boolean"/>
-        <attr name="allDayEventHeight" format="integer"/>
+        <attr name="allDayEventHeight" format="dimension"/>
     </declare-styleable>
 </resources>