Nikolay Sivov : comctl32/monthcal: Fix today label position.

Alexandre Julliard julliard at winehq.org
Tue Sep 20 13:08:35 CDT 2011


Module: wine
Branch: master
Commit: 57a70f492498de0fab4954f109b5bc3eaf586fd8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=57a70f492498de0fab4954f109b5bc3eaf586fd8

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Sep 20 10:45:24 2011 +0400

comctl32/monthcal: Fix today label position.

---

 dlls/comctl32/monthcal.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index f46ec5f..dfa3d6e 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -963,9 +963,8 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons
 
   col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1;
   if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--;
-  /* TODO: when multiple calendars layout is calculated use first column/last row calendar for that
-     imaginary day position */
-  MONTHCAL_GetDayRectI(infoPtr, &text_rect, col, 6, 0);
+  /* label is located below first calendar last row */
+  MONTHCAL_GetDayRectI(infoPtr, &text_rect, col, 6, infoPtr->dim.cx * infoPtr->dim.cy - infoPtr->dim.cx);
   box_rect = text_rect;
 
   GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &infoPtr->todaysDate, NULL,




More information about the wine-cvs mailing list