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

Qt5, Qt6: small optimization for ExtTextOut when drawing char by char.

Browse Source
This commit is contained in:
Željan Rikalo 2024-11-08 13:07:00 +01:00
parent 25a1a645ec
commit d37c67876e
4 changed files with 98 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lcl/interfaces/qt5/qtobjects.pas
View File

@ -365,6 +365,7 @@ type
TQtDeviceContext = class(TObject)
private
FPenTextInternal: boolean;
FSupportRasterOps: TRop2OrCompositionSupport;
FSupportComposition: TRop2OrCompositionSupport;
FRopMode: Integer;
@ -380,7 +381,6 @@ type
function DeviceSupportsComposition: Boolean;
function DeviceSupportsRasterOps: Boolean;
function R2ToQtRasterOp(AValue: Integer): QPainterCompositionMode;
procedure SetTextPen;
procedure SetRop(const AValue: Integer);
public
{ public fields }
@ -411,6 +411,7 @@ type
procedure setImage(AImage: TQtImage);
procedure CorrectCoordinates(var ARect: TRect);
function GetLineLastPixelPos(PrevPos, NewPos: TPoint): TPoint;
procedure SetTextPen;
public
{ Qt functions }
@ -479,6 +480,7 @@ type
property Metrics: TQtFontMetrics read GetMetrics;
property Rop2: Integer read GetRop write SetRop;
property UserDC: boolean read FUserDC write FUserDC; {if context is created from GetDC() and it's not default DC.}
property PenTextInternal: boolean read FPenTextInternal write FPenTextInternal; {optimization for ExtTextOut}
end;
{ TQtPixmap }
@ -2237,6 +2239,7 @@ begin
{NOTE FOR QT DEVELOPERS: Whenever you call TQtDeviceContext.Create() outside
of TQtWidgetSet.BeginPaint() SET APaintEvent TO FALSE !}
FPenTextInternal := True;
FUserDC := False;
Parent := nil;
ParentPixmap := nil;
@ -2278,6 +2281,7 @@ end;
constructor TQtDeviceContext.CreatePrinterContext(ADevice: QPrinterH);
begin
FPenTextInternal := True;
FUserDC := False;
SelFont := nil;
SelBrush := nil;
@ -2297,6 +2301,7 @@ end;
constructor TQtDeviceContext.CreateFromPainter(APainter: QPainterH);
begin
FPenTextInternal := True;
FUserDC := False;
SelFont := nil;
SelBrush := nil;
@ -2835,16 +2840,24 @@ begin
// what about Metrics.descent and Metrics.leading ?
y := y + Metrics.ascent;
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
if FPenTextInternal then
begin
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
end;
// The ascent is only applied here, because it also needs
// to be rotated
if Font.Angle <> 0 then
QPainter_drawText(Widget, 0, Metrics.ascent, s)
else
QPainter_drawText(Widget, x, y, s);
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
if FPenTextInternal then
begin
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
end;
// Restore previous angle
if Font.Angle <> 0 then
begin
@ -2880,14 +2893,22 @@ begin
Rotate(-0.1 * Font.Angle);
end;
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
if FPenTextInternal then
begin
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
end;
if Font.Angle <> 0 then
QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
else
QPainter_DrawText(Widget, x, y, w, h, Flags, s);
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
if FPenTextInternal then
begin
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
end;
// Restore previous angle
if Font.Angle <> 0 then

9
lcl/interfaces/qt5/qtwinapi.inc
View File

@ -2175,6 +2175,7 @@ var
R, R1: TRect;
ALayout: QtLayoutDirection;
B: boolean;
APen: QPenH;
procedure DoDrawCharByChar(const AClipped: Boolean);
var
@ -2245,6 +2246,11 @@ begin
else
WideStr := Str;
//optimization
APen := QPen_Create(QPainter_pen(QtDC.Widget));
QtDC.SetTextPen;
QtDC.PenTextInternal := False;
if (Options and ETO_CLIPPED <> 0) then
begin
QtDC.save;
@ -2265,6 +2271,9 @@ begin
else
QtDC.drawText(X, Y, @WideStr);
end;
QPainter_setPen(QtDC.Widget, APen);
QPen_destroy(APen);
QtDC.PenTextInternal := True;
if Options and ETO_RTLREADING <> 0 then
QPainter_setLayoutDirection(QtDC.Widget, ALayout);
end;

69
lcl/interfaces/qt6/qtobjects.pas
View File

@ -369,6 +369,7 @@ type
TQtDeviceContext = class(TObject)
private
FPenTextInternal: boolean;
FSupportRasterOps: TRop2OrCompositionSupport;
FSupportComposition: TRop2OrCompositionSupport;
FRopMode: Integer;
@ -385,7 +386,6 @@ type
function DeviceSupportsComposition: Boolean;
function DeviceSupportsRasterOps: Boolean;
function R2ToQtRasterOp(AValue: Integer): QPainterCompositionMode;
procedure SetTextPen;
procedure SetRop(const AValue: Integer);
public
{ public fields }
@ -416,6 +416,7 @@ type
procedure setImage(AImage: TQtImage);
procedure CorrectCoordinates(var ARect: TRect);
function GetLineLastPixelPos(PrevPos, NewPos: TPoint): TPoint;
procedure SetTextPen;
public
{ Qt functions }
@ -486,6 +487,7 @@ type
property Metrics: TQtFontMetrics read GetMetrics;
property Rop2: Integer read GetRop write SetRop;
property UserDC: boolean read FUserDC write FUserDC; {if context is created from GetDC() and it's not default DC.}
property PenTextInternal: boolean read FPenTextInternal write FPenTextInternal; {optimization for ExtTextOut}
end;
{ TQtPixmap }
@ -2292,6 +2294,7 @@ begin
{NOTE FOR QT DEVELOPERS: Whenever you call TQtDeviceContext.Create() outside
of TQtWidgetSet.BeginPaint() SET APaintEvent TO FALSE !}
FPenTextInternal := True;
FUserDC := False;
Parent := nil;
ParentPixmap := nil;
@ -2333,6 +2336,7 @@ end;
constructor TQtDeviceContext.CreatePrinterContext(ADevice: QPrinterH);
begin
FPenTextInternal := True;
FUserDC := False;
SelFont := nil;
SelBrush := nil;
@ -2353,6 +2357,7 @@ end;
constructor TQtDeviceContext.CreateFromPainter(APainter: QPainterH);
begin
FPenTextInternal := True;
FUserDC := False;
SelFont := nil;
SelBrush := nil;
@ -2899,16 +2904,23 @@ begin
// what about Metrics.descent and Metrics.leading ?
y := y + Metrics.ascent;
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
if FPenTextInternal then
begin
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
end;
// The ascent is only applied here, because it also needs
// to be rotated
if Font.Angle <> 0 then
QPainter_drawText(Widget, 0, Metrics.ascent, s)
else
QPainter_drawText(Widget, x, y, s);
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
if FPenTextInternal then
begin
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
end;
// Restore previous angle
if Font.Angle <> 0 then
begin
@ -2944,14 +2956,22 @@ begin
Rotate(-0.1 * Font.Angle);
end;
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
if FPenTextInternal then
begin
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
end;
if Font.Angle <> 0 then
QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
else
QPainter_DrawText(Widget, x, y, w, h, Flags, s);
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
if FPenTextInternal then
begin
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
end;
// Restore previous angle
if Font.Angle <> 0 then
@ -2993,16 +3013,23 @@ begin
// what about Metrics.descent and Metrics.leading ?
y := y + Metrics.ascent;
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
if FPenTextInternal then
begin
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
end;
// The ascent is only applied here, because it also needs
// to be rotated
if Font.Angle <> 0 then
QPainter_drawText(Widget, 0, Metrics.ascent, s)
else
QPainter_drawText(Widget, x, y, s);
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
if FPenTextInternal then
begin
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
end;
// Restore previous angle
if Font.Angle <> 0 then
begin
@ -3037,15 +3064,21 @@ begin
Translate(x, y);
Rotate(-0.1 * Font.Angle);
end;
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
if FPenTextInternal then
begin
APen := QPen_create(QPainter_pen(Widget));
SetTextPen;
end;
if Font.Angle <> 0 then
QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
else
QPainter_DrawText(Widget, x, y, w, h, Flags, s);
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
if FPenTextInternal then
begin
QPainter_setPen(Widget, APen);
QPen_destroy(APen);
end;
// Restore previous angle
if Font.Angle <> 0 then

8
lcl/interfaces/qt6/qtwinapi.inc
View File

@ -2172,6 +2172,7 @@ var
R, R1: TRect;
ALayout: QtLayoutDirection;
B: boolean;
APen: QPenH;
procedure DoDrawCharByChar(const AClipped: Boolean);
var
@ -2242,6 +2243,10 @@ begin
else
WideStr := Str;
//optimization
APen := QPen_Create(QPainter_pen(QtDC.Widget));
QtDC.SetTextPen;
QtDC.PenTextInternal := False;
if (Options and ETO_CLIPPED <> 0) then
begin
QtDC.save;
@ -2262,6 +2267,9 @@ begin
else
QtDC.drawText(X, Y, @WideStr);
end;
QPainter_setPen(QtDC.Widget, APen);
QPen_destroy(APen);
QtDC.PenTextInternal := True;
if Options and ETO_RTLREADING <> 0 then
QPainter_setLayoutDirection(QtDC.Widget, ALayout);
end;