paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 23:58:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: remove compatibility todos. Issue #33645

Browse Source 
git-svn-id: trunk@57710 -
This commit is contained in:
ondrej 2018-04-25 11:35:17 +00:00
parent 7ae0c035e9
commit 769fe27b8f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/buttons.pp
View File

@ -109,14 +109,14 @@ type
public
constructor Create;
destructor Destroy; override;
// procedure GetImageIndexAndEffect(State: TButtonState; out AIndex: Integer; out AEffect: TGraphicsDrawEffect); To-Do: enable for backwards compatibility
procedure GetImageIndexAndEffect(State: TButtonState; out AIndex: Integer; out AEffect: TGraphicsDrawEffect);
procedure GetImageIndexAndEffect(State: TButtonState;
APPI: Integer; const ACanvasScaleFactor: Double;
out AImageResolution: TScaledImageListResolution;
out AIndex: Integer; out AEffect: TGraphicsDrawEffect);
{function Draw(Canvas: TCanvas; const Client: TRect; const Offset: TPoint;
function Draw(Canvas: TCanvas; const Client: TRect; const Offset: TPoint;
State: TButtonState; Transparent: Boolean;
BiDiFlags: Longint): TRect; To-Do: enable for backwards compatibility }
BiDiFlags: Longint): TRect;
function Draw(Canvas: TCanvas; const Client: TRect; const Offset: TPoint;
State: TButtonState; Transparent: Boolean;
BiDiFlags, PPI: Longint; const ScaleFactor: Double): TRect;

15
lcl/include/buttonglyph.inc
View File

@ -144,6 +144,14 @@ begin
end;
end;
procedure TButtonGlyph.GetImageIndexAndEffect(State: TButtonState; out
AIndex: Integer; out AEffect: TGraphicsDrawEffect);
var
x: TScaledImageListResolution;
begin
GetImageIndexAndEffect(State, 96, 1, x, AIndex, AEffect);
end;
function TButtonGlyph.GetNumGlyphs: TNumGlyphs;
begin
if Assigned(FExternalImages) then
@ -285,6 +293,13 @@ begin
// ToDo: VCL returns the text rectangle
end;
function TButtonGlyph.Draw(Canvas: TCanvas; const Client: TRect;
const Offset: TPoint; State: TButtonState; Transparent: Boolean;
BiDiFlags: Longint): TRect;
begin
Result := Draw(Canvas, Client, Offset, State, Transparent, BiDiFlags, 96, 1);
end;
procedure TButtonGlyph.Refresh;
begin
GlyphChanged(FOriginal);