From 0298d4038185cf2d4113cd3d77f75d48670b6fdd Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Fri, 27 Jan 2012 15:20:55 +0000 Subject: #6718 Fixed an off-by-one bug; use displayedMonth consistently svn changeset:22802/svn branch:6.8 --- src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java index a2f03d6176..eb1a742db9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java @@ -481,11 +481,11 @@ public class VCalendarPanel extends FocusableFlexTable implements tmp.getDate()); final int startWeekDay = getDateTimeService().getStartWeekDay( - focusedDate); - final Date curr = (Date) focusedDate.clone(); + displayedMonth); + final Date curr = (Date) displayedMonth.clone(); // Start from the first day of the week that at least partially belongs // to the current month - curr.setDate(-startWeekDay); + curr.setDate(1 - startWeekDay); // No month has more than 6 weeks so 6 is a safe maximum for rows. for (int weekOfMonth = 1; weekOfMonth < 7; weekOfMonth++) { @@ -508,7 +508,7 @@ public class VCalendarPanel extends FocusableFlexTable implements day.addStyleDependentName(CN_FOCUSED); } } - if (curr.getMonth() != focusedDate.getMonth()) { + if (curr.getMonth() != displayedMonth.getMonth()) { day.addStyleDependentName(CN_OFFMONTH); } -- cgit v1.2.3