tvplanit: Highlight selected day in WeekView (bold). Display holiday name in WeekView's day caption.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5201 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-09-23 08:56:12 +00:00
parent 0e29ff0284
commit 36e84f7ff5
3 changed files with 47 additions and 46 deletions

View File

@ -411,17 +411,14 @@ var
dayStr: String;
strWid: Integer;
strH: Integer;
savedFontstyle: TFontStyles;
begin
dayStr := FormatDateTime(FWeekView.DayHeadAttributes.DateFormat, StartDate + ADayIndex);
{$IFDEF LCL}
{$IF FPC_FULLVERSION < 30000}DayStr := SysToUTF8(DayStr); {$ENDIF}
{$ENDIF}
if AHolidayName <> '' then
dayStr := dayStr + ' - ' + AHolidayName;
savedFontstyle := RenderCanvas.Font.Style;
if (not DisplayOnly) and SameDate(StartDate + ADayIndex, FWeekView.Date) then
RenderCanvas.Font.Style := RenderCanvas.Font.Style + [fsBold];
strWid := RenderCanvas.TextWidth(dayStr);
if strWid > WidthOf(TextRect) then
dayStr := GetDisplayString(RenderCanvas, dayStr, 0, WidthOf(TextRect) - TextMargin);
dayStr := GetDateDisplayString(RenderCanvas, StartDate + ADayIndex,
FWeekView.DayHeadAttributes.DateFormat, AHolidayName, WidthOf(TextRect) - TextMargin);
strWid := RenderCanvas.TextWidth(dayStr);
strH := RenderCanvas.TextHeight(dayStr);
@ -434,6 +431,8 @@ begin
(TextRect.Top + TextRect.Bottom - strH) div 2,
dayStr
);
RenderCanvas.Font.Style := savedFontstyle;
end;
procedure TVpWeekViewPainter.DrawDays;