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

LCL: SetDeviceScaleRatio renamed to SetCanvasScaleFactor.

Browse Source
This commit is contained in:
zeljan1 2025-01-09 09:21:59 +01:00
parent 6c47517822
commit 34844aa934
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/turbopower_ipro/iphtml.pas
View File

@ -3429,7 +3429,7 @@ begin
AScale := Application.MainForm.GetCanvasScaleFactor; AScale := Application.MainForm.GetCanvasScaleFactor;
PaintBufferBitmap.Width := Round(FClientRect.Right * AScale); PaintBufferBitmap.Width := Round(FClientRect.Right * AScale);
PaintBufferBitmap.Height := Round(FClientRect.Bottom * AScale); PaintBufferBitmap.Height := Round(FClientRect.Bottom * AScale);
LCLIntf.SetDeviceScaleRatio(PaintBufferBitmap.Canvas.Handle, AScale); LCLIntf.SetCanvasScaleFactor(PaintBufferBitmap.Canvas.Handle, AScale);
PaintBuffer := PaintBufferBitmap.Canvas; PaintBuffer := PaintBufferBitmap.Canvas;
end; end;
FTarget := PaintBuffer; FTarget := PaintBuffer;

8
components/virtualtreeview/laz.virtualtrees.pas
View File

@ -9262,7 +9262,7 @@ begin
begin begin
FHeaderBitmap.Clear; FHeaderBitmap.Clear;
FHeaderBitmap.SetSize(Round(Max(Right, R.Right - R.Left) * sc), Round(Bottom * sc)); FHeaderBitmap.SetSize(Round(Max(Right, R.Right - R.Left) * sc), Round(Bottom * sc));
LCLIntf.SetDeviceScaleRatio(FHeaderBitmap.Canvas.Handle, sc); LCLIntf.SetCanvasScaleFactor(FHeaderBitmap.Canvas.Handle, sc);
end; end;
VisibleFixedWidth := GetVisibleFixedWidth; VisibleFixedWidth := GetVisibleFixedWidth;
@ -30713,7 +30713,7 @@ begin
NodeBitmap.Width := Round(PaintWidth * ScaleFactor); NodeBitmap.Width := Round(PaintWidth * ScaleFactor);
NodeBitmap.Height := 1; NodeBitmap.Height := 1;
LCLIntf.SetDeviceScaleRatio(NodeBitmap.Canvas.Handle, ScaleFactor); LCLIntf.SetCanvasScaleFactor(NodeBitmap.Canvas.Handle, ScaleFactor);
// Make sure the buffer bitmap and target bitmap use the same transformation mode. // Make sure the buffer bitmap and target bitmap use the same transformation mode.
{$ifndef Gtk} {$ifndef Gtk}
@ -30834,7 +30834,7 @@ begin
// Avoid that the VCL copies the bitmap while changing its height. // Avoid that the VCL copies the bitmap while changing its height.
if Height > 0 then SetSize(1,1); // can't go to 0, must keep canvas if Height > 0 then SetSize(1,1); // can't go to 0, must keep canvas
SetSize(Round(PaintWidth * ScaleFactor), Round(PaintInfo.Node.NodeHeight * ScaleFactor)); SetSize(Round(PaintWidth * ScaleFactor), Round(PaintInfo.Node.NodeHeight * ScaleFactor));
LCLIntf.SetDeviceScaleRatio(NodeBitmap.Canvas.Handle, ScaleFactor); LCLIntf.SetCanvasScaleFactor(NodeBitmap.Canvas.Handle, ScaleFactor);
{$ifdef UseSetCanvasOrigin} {$ifdef UseSetCanvasOrigin}
SetCanvasOrigin(Canvas, Window.Left, 0); SetCanvasOrigin(Canvas, Window.Left, 0);
{$else} {$else}
@ -31200,7 +31200,7 @@ begin
NodeBitmap.PixelFormat := pf32Bit; NodeBitmap.PixelFormat := pf32Bit;
NodeBitmap.Width := Round((TargetRect.Right - TargetRect.Left) * ScaleFactor); NodeBitmap.Width := Round((TargetRect.Right - TargetRect.Left) * ScaleFactor);
NodeBitmap.Height := Round((TargetRect.Bottom - TargetRect.Top) * ScaleFactor); NodeBitmap.Height := Round((TargetRect.Bottom - TargetRect.Top) * ScaleFactor);
LCLIntf.SetDeviceScaleRatio(NodeBitmap.Canvas.Handle, ScaleFactor); LCLIntf.SetCanvasScaleFactor(NodeBitmap.Canvas.Handle, ScaleFactor);
end; end;
{$ifdef DEBUG_VTV}Logger.Send([lcPaintDetails],'NodeBitmap.Handle after changing height to background',NodeBitmap.Handle);{$endif} {$ifdef DEBUG_VTV}Logger.Send([lcPaintDetails],'NodeBitmap.Handle after changing height to background',NodeBitmap.Handle);{$endif}

2
designer/designer.pp
View File

@ -3635,7 +3635,7 @@ begin
try try
TextSize := Icon.Canvas.TextExtent(AComponent.Name); TextSize := Icon.Canvas.TextExtent(AComponent.Name);
Icon.SetSize(Round(TextSize.cx * ScaleFactor), Round(TextSize.cy * ScaleFactor)); Icon.SetSize(Round(TextSize.cx * ScaleFactor), Round(TextSize.cy * ScaleFactor));
LCLIntf.SetDeviceScaleRatio(Icon.Canvas.Handle, ScaleFactor); LCLIntf.SetCanvasScaleFactor(Icon.Canvas.Handle, ScaleFactor);
Icon.Canvas.Font.Assign(FDDC.Canvas.Font); Icon.Canvas.Font.Assign(FDDC.Canvas.Font);
Icon.Canvas.Font.PixelsPerInch := FDDC.Canvas.Font.PixelsPerInch; Icon.Canvas.Font.PixelsPerInch := FDDC.Canvas.Font.PixelsPerInch;
TextRect := Rect(0, 0, TextSize.cx, TextSize.cy); TextRect := Rect(0, 0, TextSize.cx, TextSize.cy);

2
lcl/include/intfbaselcl.inc
View File

@ -644,7 +644,7 @@ end;
//Currently cocoa, qt5, qt6 and gtk3 are known to support this. Without proper scale ratio //Currently cocoa, qt5, qt6 and gtk3 are known to support this. Without proper scale ratio
//setup, bitmap text rendering is blurred.See iphtml.pas, procedure TIpHtml.Render() how //setup, bitmap text rendering is blurred.See iphtml.pas, procedure TIpHtml.Render() how
//we use it.Param DC is device context with selected bitmap/image into. //we use it.Param DC is device context with selected bitmap/image into.
procedure TWidgetSet.SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); procedure TWidgetSet.SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double);
begin begin
end; end;

4
lcl/include/lclintf.inc
View File

@ -423,9 +423,9 @@ procedure SendCachedLCLMessages;
begin begin
end; end;
procedure SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); procedure SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double);
begin begin
WidgetSet.SetDeviceScaleRatio(DC, AScaleRatio); WidgetSet.SetCanvasScaleFactor(DC, AScaleRatio);
end; end;
function SetCaretRespondToFocus(Handle: hWnd; ShowHideOnFocus: boolean):Boolean; function SetCaretRespondToFocus(Handle: hWnd; ShowHideOnFocus: boolean):Boolean;

2
lcl/include/lclintfh.inc
View File

@ -109,7 +109,7 @@ procedure RemovePipeEventHandler(var AHandler: PPipeEventHandler); {$IFDEF IF_BA
function RequestInput(const InputCaption, InputPrompt : String; MaskInput : Boolean; var Value : String) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function RequestInput(const InputCaption, InputPrompt : String; MaskInput : Boolean; var Value : String) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
procedure SendCachedLCLMessages; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} procedure SendCachedLCLMessages; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
procedure SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} procedure SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SetCaretRespondToFocus(handle: HWND; ShowHideOnFocus: boolean): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetCaretRespondToFocus(handle: HWND; ShowHideOnFocus: boolean): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}

2
lcl/interfaces/cocoa/cocoalclintf.inc
View File

@ -740,7 +740,7 @@ begin
Result := True; Result := True;
end; end;
procedure TCocoaWidgetSet.SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); procedure TCocoaWidgetSet.SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double);
var var
ctx: TCocoaContext; ctx: TCocoaContext;
begin begin

2
lcl/interfaces/cocoa/cocoalclintfh.inc
View File

@ -50,5 +50,5 @@ function RawImage_FromDevice(out ARawImage: TRawImage; ADC: HDC; const ARect: TR
{function ReleaseDesignerDC(Window: HWND; DC: HDC): Integer; override;} {function ReleaseDesignerDC(Window: HWND; DC: HDC): Integer; override;}
procedure SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); override; procedure SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double); override;

2
lcl/interfaces/gtk3/gtk3lclintf.inc
View File

@ -1186,7 +1186,7 @@ begin
end; end;
end; end;
procedure TGtk3WidgetSet.SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); procedure TGtk3WidgetSet.SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double);
var var
Gtk3DC: TGtk3DeviceContext absolute DC; Gtk3DC: TGtk3DeviceContext absolute DC;
begin begin

2
lcl/interfaces/gtk3/gtk3lclintfh.inc
View File

@ -61,7 +61,7 @@ procedure RemoveEventHandler(var AHandler: PEventHandler); override;
procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override; procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override;
function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; override; function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; override;
procedure SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); override; procedure SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double); override;
procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); override; procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); override;
procedure SetRubberBandRect(const ARubberBand: HWND; const ARect: TRect); override; procedure SetRubberBandRect(const ARubberBand: HWND; const ARect: TRect); override;

6
lcl/interfaces/gtk3/gtk3objects.pas
View File

@ -228,7 +228,7 @@ type
procedure ApplyFont; procedure ApplyFont;
procedure ApplyPen; procedure ApplyPen;
procedure FillAndStroke; procedure FillAndStroke;
procedure setDeviceScaleRatio(const AValue: double); procedure SetCanvasScaleFactor(const AValue: double);
public public
CairoSurface: Pcairo_surface_t; CairoSurface: Pcairo_surface_t;
pcr: Pcairo_t; pcr: Pcairo_t;
@ -288,7 +288,7 @@ type
property CurrentPen: TGtk3Pen read FCurrentPen write FCurrentPen; property CurrentPen: TGtk3Pen read FCurrentPen write FCurrentPen;
property CurrentRegion: TGtk3Region read FCurrentRegion; property CurrentRegion: TGtk3Region read FCurrentRegion;
property CurrentTextColor: TColorRef read FCurrentTextColor write FCurrentTextColor; property CurrentTextColor: TColorRef read FCurrentTextColor write FCurrentTextColor;
property DeviceScaleRatio: double read FDeviceScaleRatio write setDeviceScaleRatio; property DeviceScaleRatio: double read FDeviceScaleRatio write SetCanvasScaleFactor;
property Offset: TPoint read GetOffset write SetOffset; property Offset: TPoint read GetOffset write SetOffset;
property OwnsSurface: Boolean read FOwnsSurface; property OwnsSurface: Boolean read FOwnsSurface;
property vBrush: TGtk3Brush read FBrush write setBrush; property vBrush: TGtk3Brush read FBrush write setBrush;
@ -2417,7 +2417,7 @@ begin
cairo_set_antialias(pcr, caa[aamode]); cairo_set_antialias(pcr, caa[aamode]);
end; end;
procedure TGtk3DeviceContext.setDeviceScaleRatio(const AValue: double); procedure TGtk3DeviceContext.SetCanvasScaleFactor(const AValue: double);
var var
matrix: Tcairo_matrix_t; matrix: Tcairo_matrix_t;
begin begin

2
lcl/interfaces/qt5/qtlclintf.inc
View File

@ -868,7 +868,7 @@ begin
// todo // todo
end; end;
procedure TQtWidgetSet.SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); procedure TQtWidgetSet.SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double);
var var
QtDc: TQtDeviceContext absolute DC; QtDc: TQtDeviceContext absolute DC;
begin begin

2
lcl/interfaces/qt5/qtlclintfh.inc
View File

@ -73,7 +73,7 @@ procedure RemovePipeEventHandler(var AHandler: PPipeEventHandler); override;
procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override; procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override;
procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); override; procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); override;
procedure SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); override; procedure SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double); override;
function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; override; function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; override;
procedure SetRubberBandRect(const ARubberBand: HWND; const ARect: TRect); override; procedure SetRubberBandRect(const ARubberBand: HWND; const ARect: TRect); override;

2
lcl/interfaces/qt6/qtlclintf.inc
View File

@ -887,7 +887,7 @@ begin
// todo // todo
end; end;
procedure TQtWidgetSet.SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); procedure TQtWidgetSet.SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double);
var var
QtDc: TQtDeviceContext absolute DC; QtDc: TQtDeviceContext absolute DC;
begin begin

2
lcl/interfaces/qt6/qtlclintfh.inc
View File

@ -73,7 +73,7 @@ procedure RemovePipeEventHandler(var AHandler: PPipeEventHandler); override;
procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override; procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override;
procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); override; procedure SetEventHandlerFlags(AHandler: PEventHandler; NewFlags: dword); override;
procedure SetDeviceScaleRatio(DC: HDC; const AScaleRatio: double); override; procedure SetCanvasScaleFactor(DC: HDC; const AScaleRatio: double); override;
function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; override; function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; override;
procedure SetRubberBandRect(const ARubberBand: HWND; const ARect: TRect); override; procedure SetRubberBandRect(const ARubberBand: HWND; const ARect: TRect); override;