pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Fix too-small default font used by TJvTFDaysPrinter for appointments (JvTimeFramework)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7108 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-08-09 17:29:14 +00:00
parent 4c9b7a668f
commit 63789cb360
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/jvcllaz/examples/JvTimeFramework/tfmain.pas
View File

@ -390,6 +390,7 @@ end;
procedure TMainForm.NextDateButtonClick(Sender: TObject); procedure TMainForm.NextDateButtonClick(Sender: TObject);
begin begin
JvTFDays1.NextDate; JvTFDays1.NextDate;
JvTFMonths1.DisplayDate := JvTFDays1.CurrentDate;
end; end;
procedure TMainForm.GotoDatePickerChange(Sender: TObject); procedure TMainForm.GotoDatePickerChange(Sender: TObject);

17
components/jvcllaz/run/JvTimeFramework/jvtfdays.pas
View File

@ -1238,6 +1238,7 @@ type
{$ENDIF Jv_TIMEBLOCKS} {$ENDIF Jv_TIMEBLOCKS}
// date navigation methods // date navigation methods
function CurrentDate: TDate;
procedure PrevDate; procedure PrevDate;
procedure NextDate; procedure NextDate;
procedure GotoDate(aDate: TDate); procedure GotoDate(aDate: TDate);
@ -9676,6 +9677,16 @@ begin
EndRow := RowCount - 1; EndRow := RowCount - 1;
end; end;
function TJvTFDays.CurrentDate: TDate;
begin
case Template.ActiveTemplate of
agtLinear:
Result := Template.LinearStartDate;
agtComparative:
Result := Template.CompDate;
end;
end;
procedure TJvTFDays.PrevDate; procedure TJvTFDays.PrevDate;
begin begin
case Template.ActiveTemplate of case Template.ActiveTemplate of
@ -13735,6 +13746,11 @@ begin
Grouping := aJvTFDays.Grouping; Grouping := aJvTFDays.Grouping;
HdrAttr := aJvTFDays.HdrAttr; HdrAttr := aJvTFDays.HdrAttr;
FixFont(FancyRowHdrAttr.MajorFont);
FixFont(FancyRowHdrAttr.Minorfont);
FixFont(GroupHdrAttr.Font);
FixFont(HdrAttr.Font);
MinColWidth := ConvertMeasure(ScreenToPrinter(aJvTFDays.MinColWidth, True), MinColWidth := ConvertMeasure(ScreenToPrinter(aJvTFDays.MinColWidth, True),
pmPixels, Measure, True); pmPixels, Measure, True);
@ -14085,6 +14101,7 @@ begin
DrawInfo.FrameColor := ApptAttr.FrameColor; DrawInfo.FrameColor := ApptAttr.FrameColor;
DrawInfo.FrameWidth := ApptAttr.FrameWidth; DrawInfo.FrameWidth := ApptAttr.FrameWidth;
DrawInfo.Font := ApptAttr.Font; DrawInfo.Font := ApptAttr.Font;
FixFont(DrawInfo.Font);
DrawInfo.Visible := True; DrawInfo.Visible := True;
if Assigned(FOnGetApptDrawInfo) then if Assigned(FOnGetApptDrawInfo) then

10
components/jvcllaz/run/JvTimeFramework/jvtfmanager.pas
View File

@ -4658,13 +4658,7 @@ end;
procedure TJvTFPrinter.NewPage; procedure TJvTFPrinter.NewPage;
var var
{ wp --- to do aBitmap: TBitmap; // wp: was Metafile, but this is not supported by Lazarus
aMetafile: TMetafile;
}
aBitmap: TBitmap;
aCanvas: TCanvas; aCanvas: TCanvas;
HeaderRect, FooterRect: TRect; HeaderRect, FooterRect: TRect;
begin begin
@ -4700,7 +4694,7 @@ begin
} }
end; end;
FBodies.AddObject('', aCanvas); FBodies.AddObject('', aCanvas);
//aCanvas.Font.PixelsPerInch := Printer.XDPI; aCanvas.Font.PixelsPerInch := Printer.XDPI;
FixFont(aCanvas.Font); FixFont(aCanvas.Font);
{ {
aCanvas.Font.PixelsPerInch := Windows.GetDeviceCaps(Printer.Handle, LOGPIXELSX); aCanvas.Font.PixelsPerInch := Windows.GetDeviceCaps(Printer.Handle, LOGPIXELSX);