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

2
components/tvplanit/laz_visualplanit.lpk
View File

@ -31,7 +31,7 @@ The Initial Developer of the Original Code is TurboPower Software.
Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved. Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved.
Contributor(s): "/> Contributor(s): "/>
<Version Major="1" Release="7"/> <Version Major="1" Release="8"/>
<Files Count="72"> <Files Count="72">
<Item1> <Item1>
<Filename Value="source\vpbase.pas"/> <Filename Value="source\vpbase.pas"/>

2
components/tvplanit/laz_visualplanit_design.lpk
View File

@ -27,7 +27,7 @@ The Initial Developer of the Original Code is TurboPower Software.
Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved. Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved.
Contributor(s): "/> Contributor(s): "/>
<Version Major="1" Release="7"/> <Version Major="1" Release="8"/>
<Files Count="6"> <Files Count="6">
<Item1> <Item1>
<Filename Value="source\design\vpreg.pas"/> <Filename Value="source\design\vpreg.pas"/>

2
components/tvplanit/laz_visualplanit_zeos.lpk
View File

@ -18,7 +18,7 @@
Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
"/> "/>
<Version Major="1" Release="7"/> <Version Major="1" Release="8"/>
<Files Count="1"> <Files Count="1">
<Item1> <Item1>
<Filename Value="source\addons\zeos\vpzeosds.pas"/> <Filename Value="source\addons\zeos\vpzeosds.pas"/>

2
components/tvplanit/laz_visualplanit_zeos_design.lpk
View File

@ -14,7 +14,7 @@
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\zeos_design"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\zeos_design"/>
</SearchPaths> </SearchPaths>
</CompilerOptions> </CompilerOptions>
<Version Major="1" Release="7"/> <Version Major="1" Release="8"/>
<Files Count="1"> <Files Count="1">
<Item1> <Item1>
<Filename Value="source\addons\zeos\vpregzeos.pas"/> <Filename Value="source\addons\zeos\vpregzeos.pas"/>

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

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

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

@ -195,7 +195,9 @@ type
procedure EditContact; procedure EditContact;
procedure EndEdit(Sender: TObject); procedure EndEdit(Sender: TObject);
procedure InitializeDefaultPopup; 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; procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF} {$ENDIF}
@ -1749,7 +1751,14 @@ begin
Invalidate; Invalidate;
end; 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); procedure TVpContactGrid.ScaleFontsPPI(const AProportion: Double);
begin begin
inherited; inherited;

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

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

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

@ -233,9 +233,12 @@ type
procedure MouseMove(Shift: TShiftState; X,Y: Integer); override; procedure MouseMove(Shift: TShiftState; X,Y: Integer); override;
procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
procedure Paint; 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; procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF} {$ENDIF}
{ drag and drop } { drag and drop }
procedure DoEndDrag(Target: TObject; X, Y: Integer); override; procedure DoEndDrag(Target: TObject; X, Y: Integer); override;
procedure DoStartDrag(var DragObject: TDragObject); override; procedure DoStartDrag(var DragObject: TDragObject); override;
@ -1533,7 +1536,20 @@ begin
end; end;
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); procedure TVpMonthView.ScaleFontsPPI(const AProportion: Double);
begin begin
inherited; inherited;

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

@ -189,7 +189,9 @@ type
procedure EditTask; procedure EditTask;
procedure EndEdit(Sender: TObject); procedure EndEdit(Sender: TObject);
procedure KeyDown(var Key: Word; Shift: TShiftState); override; 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; procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF} {$ENDIF}
@ -1248,7 +1250,14 @@ begin
end; end;
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); procedure TVpTaskList.ScaleFontsPPI(const AProportion: Double);
begin begin
inherited; inherited;

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

@ -223,7 +223,9 @@ type
procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override; procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
procedure Paint; 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; procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF} {$ENDIF}
@ -1734,7 +1736,17 @@ begin
end; end;
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); procedure TVpWeekView.ScaleFontsPPI(const AProportion: Double);
begin begin
inherited; inherited;