Browse Source

#6718 Fixed an off-by-one bug; use displayedMonth consistently

svn changeset:22802/svn branch:6.8
tags/7.0.0.alpha2
Johannes Dahlström 12 years ago
parent
commit
0298d40381
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java

+ 4
- 4
src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java View File

@@ -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);
}


Loading…
Cancel
Save