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

tvplanit: Fix compilation with Laz trunk (Hi-DPI issue). Release as v1.0.8.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6129 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-01-12 11:07:34 +00:00
parent a906dbdc1d
commit 12ae2ed3c8
10 changed files with 77 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/tvplanit/source/vpconst.pas
View File

@ -271,11 +271,14 @@ const
MAX_HINT_WIDTH = 400;
{$IFDEF LCL}
{$IF LCL_FULLVERSION >= 1080100}
VP_LCL_SCALING = 2;
{$ELSE}
{$IF LCL_FULLVERSION >= 1080000}
VP_LCL_SCALING = 1;
{$ELSE}
VP_LCL_SCALING = 0;
{$ENDIF}
{$ENDIF}{$ENDIF}
{$ELSE}
VL_LCL_SCALING := 0;
{$ENDIF}

13
components/tvplanit/source/vpcontactgrid.pas
View File

@ -195,7 +195,9 @@ type
procedure EditContact;
procedure EndEdit(Sender: TObject);
procedure InitializeDefaultPopup;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
@ -1749,7 +1751,14 @@ begin
Invalidate;
end;
{$IF VP_LCL_SCALING=1}
{$IF VP_LCL_SCALING = 2}
procedure TVpContactGrid.ScaleFontsPPI(const AToPPI: Integer;
const AProportion: Double);
begin
inherited;
DoScaleFontPPI(ContactHeadAttributes.Font, AToPPI, AProportion);
end;
{$ELSEIF VP_LCL_SCALING = 1}
procedure TVpContactGrid.ScaleFontsPPI(const AProportion: Double);
begin
inherited;

16
components/tvplanit/source/vpdayview.pas
View File

@ -389,9 +389,13 @@ type
procedure EndEdit(Sender: TObject);
procedure KeyDown(var Key: Word; Shift: TShiftState); override;
procedure SetTimeIntervals(UseGran: TVpGranularity);
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSE}
{$IF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
{$ENDIF}
{ message handlers }
procedure VpDayViewInit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message Vp_DayViewInit;
@ -2576,7 +2580,17 @@ begin
SetVScrollPos;
end;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure TVpDayView.ScaleFontsPPI(const AToPPI: Integer;
const AProportion: Double);
begin
inherited;
DoScaleFontPPI(AllDayEventAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(HeadAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(RowHeadAttributes.HourFont, AToPPI, AProportion);
DoScaleFontPPI(RowHeadAttributes.MinuteFont, AToPPI, AProportion);
end;
{$ELSEIF VP_LCL_SCALING = 1}
procedure TVpDayView.ScaleFontsPPI(const AProportion: Double);
begin
inherited;

20
components/tvplanit/source/vpmonthview.pas
View File

@ -233,9 +233,12 @@ type
procedure MouseMove(Shift: TShiftState; X,Y: Integer); override;
procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
procedure Paint; override;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
{ drag and drop }
procedure DoEndDrag(Target: TObject; X, Y: Integer); override;
procedure DoStartDrag(var DragObject: TDragObject); override;
@ -1533,7 +1536,20 @@ begin
end;
end;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure TVpMonthView.ScaleFontsPPI(const AToPPI: Integer;
const AProportion: Double);
begin
inherited;
DoScaleFontPPI(DayHeadAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(EventFont, AToPPI, AProportion);
DoScaleFontPPI(HeadAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(HolidayAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(TodayAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(WeekendAttributes.Font, AToPPI, AProportion);
end;
{$ELSEIF VP_LCL_SCALING = 1}
procedure TVpMonthView.ScaleFontsPPI(const AProportion: Double);
begin
inherited;

13
components/tvplanit/source/vptasklist.pas
View File

@ -189,7 +189,9 @@ type
procedure EditTask;
procedure EndEdit(Sender: TObject);
procedure KeyDown(var Key: Word; Shift: TShiftState); override;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
@ -1248,7 +1250,14 @@ begin
end;
end;
{$IF VP_LCL_SCALING=1}
{$IF VP_LCL_SCALING = 2}
procedure TVpTaskList.ScaleFontsPPI(const AToPPI: Integer;
const AProportion: Double);
begin
inherited;
DoScaleFontPPI(TaskHeadAttributes.Font, AToPPI, AProportion);
end;
{$ELSEIF VP_LCL_SCALING = 1}
procedure TVpTaskList.ScaleFontsPPI(const AProportion: Double);
begin
inherited;

16
components/tvplanit/source/vpweekview.pas
View File

@ -223,7 +223,9 @@ type
procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
procedure Paint; override;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
@ -1734,7 +1736,17 @@ begin
end;
end;
{$IF VP_LCL_SCALING = 1}
{$IF VP_LCL_SCALING = 2}
procedure TVpWeekView.ScaleFontsPPI(const AToPPI: Integer;
const AProportion: Double);
begin
inherited;
DoScaleFontPPI(AllDayEventAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(DayHeadAttributes.Font, AToPPI, AProportion);
DoScaleFontPPI(EventFont, AToPPI, AProportion);
DoScaleFontPPI(HeadAttributes.Font, AToPPI, AProportion);
end;
{$ELSEIF VP_LCL_SCALING = 1}
procedure TVpWeekView.ScaleFontsPPI(const AProportion: Double);
begin
inherited;