sharing uscaledpi as LCScaleDPI

lazpaint/lazpaint.lpi

@@ -174,7 +174,7 @@
         <PackageName Value="LCL"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="97">
+    <Units Count="96">
       <Unit0>
         <Filename Value="lazpaint.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -387,365 +387,361 @@
         <UnitName Value="UToolBasic"/>
       </Unit32>
       <Unit33>
-        <Filename Value="uscaledpi.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="UScaleDPI"/>
-      </Unit33>
-      <Unit34>
         <Filename Value="uresourcestrings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UResourceStrings"/>
-      </Unit34>
-      <Unit35>
+      </Unit33>
+      <Unit34>
         <Filename Value="upixelate.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FPixelate"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UPixelate"/>
-      </Unit35>
-      <Unit36>
+      </Unit34>
+      <Unit35>
         <Filename Value="utoolphong.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UToolPhong"/>
-      </Unit36>
-      <Unit37>
+      </Unit35>
+      <Unit36>
         <Filename Value="utooltext.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UToolText"/>
-      </Unit37>
-      <Unit38>
+      </Unit36>
+      <Unit37>
         <Filename Value="uimagestate.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageState"/>
-      </Unit38>
-      <Unit39>
+      </Unit37>
+      <Unit38>
         <Filename Value="ustatetype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UStateType"/>
-      </Unit39>
-      <Unit40>
+      </Unit38>
+      <Unit39>
         <Filename Value="uobject3d.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FObject3D"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UObject3D"/>
-      </Unit40>
-      <Unit41>
+      </Unit39>
+      <Unit40>
         <Filename Value="ulayerstack.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FLayerStack"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ULayerstack"/>
-      </Unit41>
-      <Unit42>
+      </Unit40>
+      <Unit41>
         <Filename Value="uvolatilescrollbar.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UVolatileScrollBar"/>
-      </Unit42>
-      <Unit43>
+      </Unit41>
+      <Unit42>
         <Filename Value="ublendop.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FBlendOp"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UBlendOp"/>
-      </Unit43>
-      <Unit44>
+      </Unit42>
+      <Unit43>
         <Filename Value="uimageobservation.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageObservation"/>
-      </Unit44>
-      <Unit45>
+      </Unit43>
+      <Unit44>
         <Filename Value="uloading.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FLoading"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ULoading"/>
-      </Unit45>
-      <Unit46>
+      </Unit44>
+      <Unit45>
         <Filename Value="ufilterconnector.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UFilterConnector"/>
-      </Unit46>
-      <Unit47>
+      </Unit45>
+      <Unit46>
         <Filename Value="uzoom.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UZoom"/>
-      </Unit47>
-      <Unit48>
+      </Unit46>
+      <Unit47>
         <Filename Value="ufilters.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UFilters"/>
-      </Unit48>
-      <Unit49>
+      </Unit47>
+      <Unit48>
         <Filename Value="uimageaction.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageAction"/>
-      </Unit49>
-      <Unit50>
+      </Unit48>
+      <Unit49>
         <Filename Value="uloadimage.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ULoadImage"/>
-      </Unit50>
-      <Unit51>
+      </Unit49>
+      <Unit50>
         <Filename Value="uimagediff.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageDiff"/>
-      </Unit51>
-      <Unit52>
+      </Unit50>
+      <Unit51>
         <Filename Value="usharpen.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FSharpen"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="USharpen"/>
-      </Unit52>
-      <Unit53>
+      </Unit51>
+      <Unit52>
         <Filename Value="uphongfilter.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FPhongFilter"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UPhongFilter"/>
-      </Unit53>
-      <Unit54>
+      </Unit52>
+      <Unit53>
         <Filename Value="ufilterfunction.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FFilterFunction"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit54>
-      <Unit55>
+        <UnitName Value="UFilterFunction"/>
+      </Unit53>
+      <Unit54>
         <Filename Value="ufilterthread.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UFilterThread"/>
-      </Unit55>
-      <Unit56>
+      </Unit54>
+      <Unit55>
         <Filename Value="utranslation.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UTranslation"/>
-      </Unit56>
-      <Unit57>
+      </Unit55>
+      <Unit56>
         <Filename Value="uonline.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UOnline"/>
-      </Unit57>
-      <Unit58>
+      </Unit56>
+      <Unit57>
         <Filename Value="uscripting.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UScripting"/>
-      </Unit58>
-      <Unit59>
+      </Unit57>
+      <Unit58>
         <Filename Value="umenu.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UMenu"/>
-      </Unit59>
-      <Unit60>
+      </Unit58>
+      <Unit59>
         <Filename Value="ucolorfilters.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UColorFilters"/>
-      </Unit60>
-      <Unit61>
+      </Unit59>
+      <Unit60>
         <Filename Value="uadjustcurves.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FAdjustCurves"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit61>
-      <Unit62>
+      </Unit60>
+      <Unit61>
         <Filename Value="quote.inc"/>
         <IsPartOfProject Value="True"/>
-      </Unit62>
-      <Unit63>
+      </Unit61>
+      <Unit62>
         <Filename Value="uscripttype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UScriptType"/>
-      </Unit63>
-      <Unit64>
+      </Unit62>
+      <Unit63>
         <Filename Value="ulayeraction.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ULayerAction"/>
-      </Unit64>
-      <Unit65>
+      </Unit63>
+      <Unit64>
         <Filename Value="uimagetype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageType"/>
-      </Unit65>
-      <Unit66>
+      </Unit64>
+      <Unit65>
         <Filename Value="uposterize.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FPosterize"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit66>
-      <Unit67>
+      </Unit65>
+      <Unit66>
         <Filename Value="umyslv.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UMySLV"/>
-      </Unit67>
-      <Unit68>
+      </Unit66>
+      <Unit67>
         <Filename Value="ubrowseimages.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FBrowseImages"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit68>
-      <Unit69>
+      </Unit67>
+      <Unit68>
         <Filename Value="utoollayer.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UToolLayer"/>
-      </Unit69>
-      <Unit70>
+      </Unit68>
+      <Unit69>
         <Filename Value="unoisefilter.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FNoiseFilter"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit70>
-      <Unit71>
+      </Unit69>
+      <Unit70>
         <Filename Value="uprint.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FPrint"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit71>
-      <Unit72>
+      </Unit70>
+      <Unit71>
         <Filename Value="uimagelist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FImageList"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit72>
-      <Unit73>
+      </Unit71>
+      <Unit72>
         <Filename Value="ubarupdown.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UBarUpDown"/>
-      </Unit73>
-      <Unit74>
+      </Unit72>
+      <Unit73>
         <Filename Value="ufileextensions.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UFileExtensions"/>
-      </Unit74>
-      <Unit75>
+      </Unit73>
+      <Unit74>
         <Filename Value="ufilesystem.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UFileSystem"/>
-      </Unit75>
-      <Unit76>
+      </Unit74>
+      <Unit75>
         <Filename Value="utoolbrush.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UToolBrush"/>
-      </Unit76>
-      <Unit77>
+      </Unit75>
+      <Unit76>
         <Filename Value="umainformlayout.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UMainFormLayout"/>
+      </Unit76>
+      <Unit77>
+        <Filename Value="maintoolbar.inc"/>
+        <IsPartOfProject Value="True"/>
       </Unit77>
       <Unit78>
-        <Filename Value="maintoolbar.inc"/>
+        <Filename Value="lazpaintdialogs.inc"/>
         <IsPartOfProject Value="True"/>
       </Unit78>
       <Unit79>
-        <Filename Value="lazpaintdialogs.inc"/>
-        <IsPartOfProject Value="True"/>
-      </Unit79>
-      <Unit80>
         <Filename Value="usaveoption.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FSaveOption"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="USaveOption"/>
-      </Unit80>
-      <Unit81>
+      </Unit79>
+      <Unit80>
         <Filename Value="ubrushtype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UBrushType"/>
-      </Unit81>
-      <Unit82>
+      </Unit80>
+      <Unit81>
         <Filename Value="ugeometricbrush.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FGeometricBrush"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit82>
-      <Unit83>
+      </Unit81>
+      <Unit82>
         <Filename Value="uraintype.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit83>
-      <Unit84>
+      </Unit82>
+      <Unit83>
         <Filename Value="uformrain.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FRain"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UFormRain"/>
-      </Unit84>
-      <Unit85>
+      </Unit83>
+      <Unit84>
         <Filename Value="upalettetoolbar.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UPaletteToolbar"/>
+      </Unit84>
+      <Unit85>
+        <Filename Value="tablet\laztablet.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit85>
       <Unit86>
-        <Filename Value="tablet\laztablet.pas"/>
+        <Filename Value="tablet\laztabletother.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit86>
       <Unit87>
-        <Filename Value="tablet\laztabletother.pas"/>
+        <Filename Value="tablet\laztabletwin.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit87>
       <Unit88>
-        <Filename Value="tablet\laztabletwin.pas"/>
+        <Filename Value="tablet\Tablet.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit88>
       <Unit89>
-        <Filename Value="tablet\Tablet.pas"/>
+        <Filename Value="tablet\WintabConsts.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit89>
       <Unit90>
-        <Filename Value="tablet\WintabConsts.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit90>
-      <Unit91>
         <Filename Value="utoolicon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UToolIcon"/>
-      </Unit91>
-      <Unit92>
+      </Unit90>
+      <Unit91>
         <Filename Value="uimagepreview.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImagePreview"/>
-      </Unit92>
-      <Unit93>
+      </Unit91>
+      <Unit92>
         <Filename Value="upreviewdialog.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FPreviewDialog"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UPreviewDialog"/>
-      </Unit93>
-      <Unit94>
+      </Unit92>
+      <Unit93>
         <Filename Value="uquestion.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FQuestion"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UQuestion"/>
-      </Unit94>
-      <Unit95>
+      </Unit93>
+      <Unit94>
         <Filename Value="utiff.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UTiff"/>
-      </Unit95>
-      <Unit96>
+      </Unit94>
+      <Unit95>
         <Filename Value="uimageview.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageView"/>
-      </Unit96>
+      </Unit95>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

lazpaint/lazpaint.lpr

@@ -15,7 +15,7 @@ uses
   LazPaintType, LazpaintInstance, LazpaintMainForm, UConfig, UOnline,
 
   UToolbox, UChooseColor, ULayerstack,  //tool windows
-  UMac, UScaleDPI, UVolatileScrollBar, UCursors, UTranslation, //interface
+  UMac, LCScaleDPI, UVolatileScrollBar, UCursors, UTranslation, //interface
 
   UGraph, UTool, UImage, UStateType, UImageState, UClipboard,
   UCommandline, UParse, UZoom, UResourceStrings, UImageObservation,

lazpaint/lazpaintinstance.pas

@@ -208,7 +208,7 @@ uses LCLType, Types, Forms, Dialogs, FileUtil, LCLIntf, Math,
      UImageAction, USharpen, uposterize, UPhongFilter, UFilterFunction,
      uprint, USaveOption, UFormRain,
 
-     ugraph, UScaleDPI, ucommandline, uabout;
+     ugraph, LCScaleDPI, ucommandline, uabout;
 
 { TLazPaintInstance }
 

lazpaint/lazpaintmainform.pas

@@ -16,7 +16,7 @@ uses
   BGRABitmap, BGRABitmapTypes, BGRALayers, BGRASVGOriginal,
 
   LazPaintType, UMainFormLayout, UTool, UImage, UImageAction, ULayerAction, UZoom, UImageView,
-  UImageObservation, UConfig, UScaleDPI, UResourceStrings,
+  UImageObservation, UConfig, LCScaleDPI, UResourceStrings,
   UMenu, uscripting, ubrowseimages, UToolPolygon, UBarUpDown,
 
   laztablet, udarktheme;
@@ -838,7 +838,7 @@ begin
   FLayout := TMainFormLayout.Create(self);
   FImageView := nil;
 
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   //use background color
   FormBackgroundColor := OutsideColor;

lazpaint/uabout.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, StdCtrls, Buttons, uscaledpi, BGRATextFX, BGRAGradients,
+  ExtCtrls, StdCtrls, Buttons, LCScaleDPI, BGRATextFX, BGRAGradients,
   LazPaintType;
 
 type
@@ -119,7 +119,7 @@ procedure TFAbout.FormCreate(Sender: TObject);
 var bmp: TBitmap;
     titlefont: TFont;
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   Self.DoubleBuffered:=True;
 

lazpaint/uadjustcurves.pas

@@ -105,7 +105,7 @@ type
 
 implementation
 
-uses UResourceStrings, LCLType, UMac, Math, UScaleDPI, BGRAGradientScanner,
+uses UResourceStrings, LCLType, UMac, Math, LCScaleDPI, BGRAGradientScanner,
   UColorFilters;
 
 { TFAdjustCurves }
@@ -114,7 +114,7 @@ procedure TFAdjustCurves.FormCreate(Sender: TObject);
 var
   i: Integer;
 begin
-  ScaleDPI(Self, OriginalDPI);
+  ScaleControl(Self, OriginalDPI);
 
   CheckOKCancelBtns(Button_OK, Button_Cancel);
   FSelectedPoint:= -1;

lazpaint/ublendop.pas

@@ -75,7 +75,7 @@ function ShowBlendOpDialog(AInstance: TLazPaintCustomInstance; var BlendOp: TBle
 
 implementation
 
-uses LCLType,uscaledpi,umac,uresourcestrings,ugraph,BGRAThumbnail,Math, BGRATextFX;
+uses LCLType,LCScaleDPI,umac,uresourcestrings,ugraph,BGRAThumbnail,Math, BGRATextFX;
 
 function TFBlendOp.GetPattern(AWidth,AHeight: integer; APattern: string; ACheckers: boolean): TBGRABitmap;
 var lColor: TBGRAPixel;
@@ -269,7 +269,7 @@ end;
 
 procedure TFBlendOp.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(self,OriginalDPI);
+  ScaleControl(self,OriginalDPI);
   FListBoxInternalMargin:= ListBox_PatternUnder.Width - ListBox_PatternUnder.ClientWidth + ScrollBar1.Height;
   {$IFDEF LINUX}
   ListBox_PatternUnder.Style := lbOwnerDrawVariable;

lazpaint/ucanvassize.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, Types, FileUtil, LResources, Forms, Controls, Graphics,
-  Dialogs, StdCtrls, Spin, BGRAVirtualScreen, LazPaintType, uscaledpi,
+  Dialogs, StdCtrls, Spin, BGRAVirtualScreen, LazPaintType, LCScaleDPI,
   uresourcestrings, BGRABitmap, BGRALayers, BGRALayerOriginal, uimage;
 
 type
@@ -82,7 +82,7 @@ end;
 procedure TFCanvasSize.FormCreate(Sender: TObject);
 begin
   FIgnoreInput:= true;
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   SpinEdit_Width.MaxValue := MaxImageWidth;
   SpinEdit_Height.MaxValue := MaxImageHeight;

lazpaint/uchoosecolor.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
   ExtCtrls, BGRABitmap, BGRABitmapTypes, StdCtrls, Buttons,
-  BGRAVirtualScreen, BCButton, LazPaintType, uscaledpi, uresourcestrings;
+  BGRAVirtualScreen, BCButton, LazPaintType, LCScaleDPI, uresourcestrings;
 
 const externalMargin = 3;
 
@@ -99,7 +99,7 @@ begin
    BorderStyle:= bsDialog;
    {$ENDIF}
    ClientHeight := DoScaleY(160,OriginalDPI,TFChooseColor_CustomDPI);
-   ScaleDPI(Self,OriginalDPI,TFChooseColor_CustomDPI);
+   ScaleControl(Self,OriginalDPI,TFChooseColor_CustomDPI);
    EColor.Font.Height := FontFullHeightSign*DoScaleY(14,OriginalDPI,TFChooseColor_CustomDPI);
    LColor.Font.Height := FontFullHeightSign*DoScaleY(14,OriginalDPI,TFChooseColor_CustomDPI);
    EColor.AdjustSize;

lazpaint/ucolorintensity.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ComCtrls, StdCtrls, Spin, BGRABitmap, LazPaintType, uscaledpi,
+  ComCtrls, StdCtrls, Spin, BGRABitmap, LazPaintType, LCScaleDPI,
   uresourcestrings, ufilterconnector, uscripting;
 
 type
@@ -64,7 +64,7 @@ uses umac, BGRABitmapTypes, UColorFilters;
 
 procedure TFColorIntensity.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   FShiftCaption:= Label_Shift.Caption;
   FMultiplyCaption := Label_Multiply.Caption;

lazpaint/ucolorize.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ComCtrls, Spin, BGRABitmap, uscaledpi, lazpainttype,
+  StdCtrls, ComCtrls, Spin, BGRABitmap, LCScaleDPI, lazpainttype,
   ufilterconnector, uscripting;
 
 type
@@ -78,7 +78,7 @@ uses umac, BGRABitmapTypes, uresourcestrings, UColorFilters;
 
 procedure TFColorize.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK,Button_Cancel);
   CheckFloatSpinEdit(FloatSpinEdit_Hue);

lazpaint/ucustomblur.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, ExtDlgs,  bgrabitmap, LazPaintType, UScaleDPI,
+  StdCtrls, ExtCtrls, ExtDlgs,  bgrabitmap, LazPaintType, LCScaleDPI,
   UResourceStrings, UFilterConnector, UFilterThread, ubrowseimages;
 
 type
@@ -54,7 +54,7 @@ uses umac,BGRABitmapTypes, BGRAFilters, UFileSystem;
 
 procedure TFCustomBlur.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK,Button_Cancel);
   subConfig := TStringStream.Create('[Tool]'+LineEnding+

lazpaint/uemboss.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, StdCtrls, ComCtrls, BGRABitmap, LazPaintType, uscaledpi,
+  ExtCtrls, StdCtrls, ComCtrls, BGRABitmap, LazPaintType, LCScaleDPI,
   ufilterconnector;
 
 type
@@ -76,7 +76,7 @@ end;
 
 procedure TFEmboss.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   InPaintBoxMouseMove := false;
   CheckOKCancelBtns(Button_OK{,Button_Cancel});

lazpaint/ufilterfunction.pas

@@ -72,7 +72,7 @@ function ShowFilterFunctionDlg(AFilterConnector: TObject):boolean;
 
 implementation
 
-uses UScaleDPI, UMac, LazPaintType;
+uses LCScaleDPI, UMac, LazPaintType;
 
 function ShowFilterFunctionDlg(AFilterConnector: TObject): boolean;
 var
@@ -95,7 +95,7 @@ end;
 
 procedure TFFilterFunction.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK,Button_Cancel);
 

lazpaint/uformrain.pas

@@ -61,7 +61,7 @@ function ShowRainDlg(AFilterConnector: TObject):boolean;
 
 implementation
 
-uses UScaleDPI, umac, LazPaintType;
+uses LCScaleDPI, umac, LazPaintType;
 
 function ShowRainDlg(AFilterConnector: TObject):boolean;
 var
@@ -84,7 +84,7 @@ end;
 
 procedure TFRain.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
   CheckOKCancelBtns(Button_OK{,Button_Cancel});
 end;
 

lazpaint/ugeometricbrush.pas

@@ -36,7 +36,7 @@ function ShowGeometricBrushDialog(AInstance: TLazPaintCustomInstance) : TLazPain
 
 implementation
 
-uses BGRABitmapTypes, UScaleDPI, umac;
+uses BGRABitmapTypes, LCScaleDPI, umac;
 
 function ShowGeometricBrushDialog(AInstance: TLazPaintCustomInstance): TLazPaintBrush;
 var f:TFGeometricBrush;
@@ -84,7 +84,7 @@ end;
 
 procedure TFGeometricBrush.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
   CheckOKCancelBtns(Button_OK,Button_Cancel);
 
   FBrush := TLazPaintBrush.Create;

lazpaint/ugraph.pas

@@ -58,7 +58,7 @@ procedure BCAssignSystemStyle(AButton: TBCButton);
 implementation
 
 uses GraphType, math, Types, BGRAUTF8, FileUtil, dialogs, BGRAAnimatedGif,
-  BGRAGradients, BGRATextFX, uresourcestrings, uscaledpi, BCTypes,
+  BGRAGradients, BGRATextFX, uresourcestrings, LCScaleDPI, BCTypes,
   BGRAThumbnail;
 
 procedure BCAssignSystemState(AState: TBCButtonState; AFontColor, ATopColor, AMiddleTopColor, AMiddleBottomColor, ABottomColor, ABorderColor: TColor);

lazpaint/ulayerstack.pas

@@ -96,7 +96,7 @@ type
 
 implementation
 
-uses BGRAFillInfo,uscaledpi,uresourcestrings,ublendop, uimage, utool, BGRAText, BGRAThumbnail,
+uses BGRAFillInfo,LCScaleDPI,uresourcestrings,ublendop, uimage, utool, BGRAText, BGRAThumbnail,
    BGRALayerOriginal, math, BGRATransform, BGRASVGOriginal;
 
 function TFLayerStack.DrawLayerItem(ABitmap: TBGRABitmap; layerPos: TPoint; layerIndex: integer; ASelected: boolean): TDrawLayerItemResult;
@@ -178,7 +178,7 @@ end;
 
 procedure TFLayerStack.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
   FCompletelyResizeable:= true;
   Position := poDesigned;
   ZoomFactor := 1;

lazpaint/uloading.pas

@@ -35,7 +35,7 @@ procedure MessagePopupHide;
 
 implementation
 
-uses BGRALayers, BGRAReadLzp, UScaleDPI, LazPaintType, BGRABitmapTypes;
+uses BGRALayers, BGRAReadLzp, LCScaleDPI, LazPaintType, BGRABitmapTypes;
 
 const MarginTopBottom = 3;
       MarginLeftRight = 3;
@@ -142,4 +142,4 @@ finalization
   PopupWindow.Free;
 
 end.
-
+

lazpaint/umenu.pas

@@ -37,7 +37,7 @@ type
 
 implementation
 
-uses UResourceStrings, BGRAUTF8, LazPaintType, UScaleDPI, ComCtrls, Graphics,
+uses UResourceStrings, BGRAUTF8, LazPaintType, LCScaleDPI, ComCtrls, Graphics,
   Spin, StdCtrls, BGRAText, Controls;
 
 { TMainFormMenu }

lazpaint/umotionblur.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, uscaledpi,
+  StdCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, LCScaleDPI,
   UFilterConnector, UFilterThread;
 
 type
@@ -177,7 +177,7 @@ end;
 
 procedure TFMotionBlur.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   InPaintBoxMouseMove := false;
   CheckOKCancelBtns(Button_OK{,Button_Cancel});

lazpaint/umultiimage.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ComCtrls, BGRABitmap, LazPaintType, uscaledpi, BGRABitmapTypes;
+  StdCtrls, ComCtrls, BGRABitmap, LazPaintType, LCScaleDPI, BGRABitmapTypes;
 
 type
 
@@ -38,7 +38,7 @@ uses umac, BGRAThumbnail;
 
 procedure TFMultiImage.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK,Button_Cancel);
 end;

lazpaint/unewimage.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
   StdCtrls, Spin, Buttons, ComCtrls, ExtCtrls, BGRAVirtualScreen, BGRAShape,
-  uimage, LazPaintType, uscaledpi, BGRABitmap, BGRABitmapTypes;
+  uimage, LazPaintType, LCScaleDPI, BGRABitmap, BGRABitmapTypes;
 
 const
   shadowOffsetX = 3;
@@ -256,7 +256,7 @@ end;
 
 procedure TFNewImage.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   FRecomputing := true;
   SpinEdit_Width.MaxValue := MaxImageWidth;

lazpaint/unoisefilter.pas

@@ -44,7 +44,7 @@ function ShowNoiseFilterDlg(AFilterConnector: TObject):boolean;
 
 implementation
 
-uses BGRAGradientScanner, umac, UScaleDPI, LazPaintType;
+uses BGRAGradientScanner, umac, LCScaleDPI, LazPaintType;
 
 function ShowNoiseFilterDlg(AFilterConnector: TObject):boolean;
 var
@@ -96,7 +96,7 @@ end;
 
 procedure TFNoiseFilter.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK{,Button_Cancel});
   CheckSpinEdit(SpinEdit_Alpha);

lazpaint/uobject3d.pas

@@ -152,7 +152,7 @@ function ShowObject3DDlg({%H-}Instance: TLazPaintCustomInstance; filenameUTF8: s
 
 implementation
 
-uses LazFileUtils, ugraph, uscaledpi, umac, ULoadImage, UFileSystem;
+uses LazFileUtils, ugraph, LCScaleDPI, umac, ULoadImage, UFileSystem;
 
 const PointLightDist = 80;
 
@@ -461,7 +461,7 @@ end;
 
 procedure TFObject3D.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK,Button_Cancel);
   CheckSpinEdit(SpinEdit_ColorOpacity);

lazpaint/upalettetoolbar.pas

@@ -94,7 +94,7 @@ type
 
 implementation
 
-uses UScaleDPI, Graphics, Forms, UGraph,
+uses LCScaleDPI, Graphics, Forms, UGraph,
   UResourceStrings, BGRAColorQuantization,
   ULayerAction, UCursors, UFileSystem;
 

lazpaint/uphongfilter.pas

@@ -63,7 +63,7 @@ function ShowPhongFilterDlg(AFilterConnector: TObject):boolean;
 
 implementation
 
-uses UScaleDPI, UMac, BGRAGradients, LazPaintType;
+uses LCScaleDPI, UMac, BGRAGradients, LazPaintType;
 
 function ShowPhongFilterDlg(AFilterConnector: TObject): boolean;
 var
@@ -94,7 +94,7 @@ end;
 
 procedure TFPhongFilter.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
   CheckOKCancelBtns(Button_OK,Button_Cancel);
   FCenter := PointF(0.5,0.5);
 end;

lazpaint/upixelate.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, uscaledpi,
+  StdCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, LCScaleDPI,
   ufilterconnector;
 
 type
@@ -64,7 +64,7 @@ end;
 
 procedure TFPixelate.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK{,Button_Cancel});
   CheckSpinEdit(SpinEdit_PixelSize);

lazpaint/uposterize.pas

@@ -39,7 +39,7 @@ function ShowPosterizeDlg(AInstance: TLazPaintCustomInstance; AParameters: TVari
 
 implementation
 
-uses UScaleDPI, UMac, UColorFilters;
+uses LCScaleDPI, UMac, UColorFilters;
 
 function ShowPosterizeDlg(AInstance: TLazPaintCustomInstance; AParameters: TVariableSet): boolean;
 var FPosterize: TFPosterize;
@@ -72,7 +72,7 @@ end;
 
 procedure TFPosterize.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK{,Button_Cancel});
   CheckSpinEdit(SpinEdit_Levels);

lazpaint/uprint.pas

@@ -95,7 +95,7 @@ type
 
 implementation
 
-uses printers, UResourceStrings, Types, UScaleDPI, umac;
+uses printers, UResourceStrings, Types, LCScaleDPI, umac;
 
 var
   marginLeft, marginRight, marginTop, marginBottom: integer;
@@ -588,7 +588,7 @@ end;
 
 procedure TFPrint.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckSpinEdit(SpinEdit_DpiY);
   CheckSpinEdit(SpinEdit_DpiX);

lazpaint/uquestion.pas

@@ -42,7 +42,7 @@ function ShowQuestionDialog(ATitle, AQuestion: string; AButtons: TMsgDlgButtons;
 
 implementation
 
-uses UScaleDPI, UResourceStrings;
+uses LCScaleDPI, UResourceStrings;
 
 function QuestionResult(AValue: TModalResult): TQuestionResult;
 begin
@@ -69,7 +69,7 @@ end;
 
 procedure TFQuestion.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(self, OriginalDPI);
+  ScaleControl(self, OriginalDPI);
 end;
 
 procedure TFQuestion.Init(ATitle, AQuestion: string; AButtons: TMsgDlgButtons; AShowRemember: boolean);

lazpaint/uradialblur.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Spin, ExtCtrls, BGRABitmap, BGRABitmapTypes, LazPaintType, UScaleDPI,
+  StdCtrls, Spin, ExtCtrls, BGRABitmap, BGRABitmapTypes, LazPaintType, LCScaleDPI,
   UFilterConnector, UFilterThread;
 
 type
@@ -86,7 +86,7 @@ end;
 
 procedure TFRadialBlur.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   blurType := rbNormal;
   CheckOKCancelBtns(Button_OK{,Button_Cancel});

lazpaint/uresample.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Spin, ComCtrls, BGRAVirtualScreen, LazPaintType, uscaledpi,
+  StdCtrls, Spin, ComCtrls, BGRAVirtualScreen, LazPaintType, LCScaleDPI,
   uresourcestrings, BGRABitmap, uscripting;
 
 type
@@ -81,7 +81,7 @@ end;
 procedure TFResample.FormCreate(Sender: TObject);
 begin
   FIgnoreInput := true;
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   SpinEdit_Width.MaxValue := MaxImageWidth;
   SpinEdit_Height.MaxValue := MaxImageHeight;

lazpaint/usaveoption.pas

@@ -111,7 +111,7 @@ function ShowSaveOptionDialog(AInstance: TLazPaintCustomInstance; AOutputFilenam
 implementation
 
 uses UGraph, FPWriteJPEG, UResourceStrings, FPWriteBMP, BMPcomn,
-  UMySLV, BGRAWriteBmpMioMap, BGRADithering, UFileSystem, UScaleDPI,
+  UMySLV, BGRAWriteBmpMioMap, BGRADithering, UFileSystem, LCScaleDPI,
   BGRAThumbnail, BGRAIconCursor, BGRAWinResource;
 
 function ShowSaveOptionDialog(AInstance: TLazPaintCustomInstance; AOutputFilenameUTF8: string): boolean;

lazpaint/usharpen.pas

@@ -38,7 +38,7 @@ function ShowSharpenDlg(AFilterConnector: TObject; AMode : TSharpenMode):boolean
 
 implementation
 
-uses UScaleDPI, UMac, LazPaintType, BGRABitmap, BGRABitmapTypes;
+uses LCScaleDPI, UMac, LazPaintType, BGRABitmap, BGRABitmapTypes;
 
 function ShowSharpenDlg(AFilterConnector: TObject; AMode : TSharpenMode): boolean;
 var FSharpen: TFSharpen;
@@ -68,7 +68,7 @@ end;
 
 procedure TFSharpen.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckOKCancelBtns(Button_OK{,Button_Cancel});
   CheckSpinEdit(SpinEdit_Amount);

lazpaint/ushiftcolors.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ComCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, uscaledpi,
+  StdCtrls, ComCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, LCScaleDPI,
   ufilterconnector, uscripting;
 
 type
@@ -68,7 +68,7 @@ uses umac, BGRABitmapTypes, uresourcestrings, UColorFilters;
 
 procedure TFShiftColors.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckFloatSpinEdit(FloatSpinEdit_Saturation);
   CheckFloatSpinEdit(FloatSpinEdit_Hue);

lazpaint/utool.pas

@@ -277,7 +277,7 @@ function ToolPopupMessageToStr(AMessage :TToolPopupMessage): string;
 
 implementation
 
-uses Types, ugraph, uscaledpi, LazPaintType, UCursors, BGRATextFX, ULoading, uresourcestrings,
+uses Types, ugraph, LCScaleDPI, LazPaintType, UCursors, BGRATextFX, ULoading, uresourcestrings,
   BGRATransform;
 
 function StrToPaintToolType(const s: ansistring): TPaintToolType;

lazpaint/utooldeformationgrid.pas

@@ -102,7 +102,7 @@ type
 
 implementation
 
-uses LCLType, ugraph, uscaledpi, LazPaintType, BGRAFillInfo, BGRATransform;
+uses LCLType, ugraph, LCScaleDPI, LazPaintType, BGRAFillInfo, BGRATransform;
 
 { TToolLayerMapping }
 

lazpaint/utwirl.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, uscaledpi, ufilterconnector, BGRABitmapTypes;
+  StdCtrls, Spin, ExtCtrls, BGRABitmap, LazPaintType, LCScaleDPI, ufilterconnector, BGRABitmapTypes;
 
 type
 
@@ -72,7 +72,7 @@ end;
 
 procedure TFTwirl.FormCreate(Sender: TObject);
 begin
-  ScaleDPI(Self,OriginalDPI);
+  ScaleControl(Self,OriginalDPI);
 
   CheckSpinEdit(SpinEdit_Radius);
   CheckSpinEdit(SpinEdit_Angle);

lazpaintcontrols/lazpaintcontrols.lpk

@@ -11,7 +11,7 @@
       </SearchPaths>
     </CompilerOptions>
     <Version Minor="1"/>
-    <Files Count="9">
+    <Files Count="10">
       <Item1>
         <Filename Value="lctoolbars.pas"/>
         <UnitName Value="LCToolbars"/>
@@ -47,8 +47,12 @@
       </Item8>
       <Item9>
         <Filename Value="lcvectortextshapes.pas"/>
-        <UnitName Value="lcvectortextshapes"/>
+        <UnitName Value="LCVectorTextShapes"/>
       </Item9>
+      <Item10>
+        <Filename Value="lcscaledpi.pas"/>
+        <UnitName Value="LCScaleDPI"/>
+      </Item10>
     </Files>
     <RequiredPkgs Count="4">
       <Item1>

lazpaintcontrols/lazpaintcontrols.pas

@@ -9,7 +9,7 @@ interface
 uses
   LCToolbars, LCVectorialFill, LCVectorialFillInterface, LCVectorOriginal, 
   LCVectorPolyShapes, LCVectorRectShapes, LCVectorialFillControl, 
-  LCVectorShapes, LCVectorTextShapes, LazarusPackageIntf;
+  LCVectorShapes, LCVectorTextShapes, LCScaleDPI, LazarusPackageIntf;
 
 implementation
 

lazpaint/uscaledpi.pas → lazpaintcontrols/lcscaledpi.pas

@@ -1,134 +1,134 @@
-unit UScaleDPI;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Forms, Graphics, Controls, ComCtrls;
-
-procedure HighDPI(FromDPI: Integer);
-procedure ScaleDPI(Control: TControl; FromDPI: Integer; ToDPI_X: Integer = 0; ToDPI_Y: Integer = 0);
-procedure ScaleImageList(SourceList: TImageList; newWidth, newHeight: Integer; TargetList: TImageList);
-function DoScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer;
-function DoScaleY(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer;
-
-implementation
-
-uses BGRABitmap, BGRABitmapTypes, LCLType;
-
-procedure HighDPI(FromDPI: Integer);
-var
-  i: Integer;
-begin
-  for i:=0 to Screen.FormCount-1 do begin
-    ScaleDPI(Screen.Forms[i],FromDPI);
-  end;
-end;
-
-procedure ScaleImageList(SourceList: TImageList; newWidth, newHeight: Integer; TargetList: TImageList);
-var
-  TempBmp: TBitmap;
-  TempBGRA: array of TBGRABitmap;
-  i: Integer;
-
-begin
-  setlength(TempBGRA, SourceList.Count);
-  TempBmp := TBitmap.Create;
-  for i := 0 to SourceList.Count-1 do
-  begin
-    SourceList.GetBitmap(i,TempBmp);
-    TempBGRA[i] := TBGRABitmap.Create(TempBmp);
-    TempBGRA[i].ResampleFilter := rfBestQuality;
-    if (TempBGRA[i].width=0) or (TempBGRA[i].height=0) then continue;
-    while (TempBGRA[i].Width < NewWidth) or (TempBGRA[i].Height < NewHeight) do
-      BGRAReplace(TempBGRA[i], TempBGRA[i].FilterSmartZoom3(moLowSmooth));
-    BGRAReplace(TempBGRA[i], TempBGRA[i].Resample(NewWidth,NewHeight));
-    BGRAReplace(TempBGRA[i], TempBGRA[i].FilterSharpen(0.50));
-  end;
-  TempBmp.Free;
-
-  TargetList.Clear;
-  TargetList.Width:= NewWidth;
-  TargetList.Height:= NewHeight;
-
-  for i := 0 to high(TempBGRA) do
-  begin
-    {$IFDEF LCLWin32}
-    If TBGRAPixel_RGBAOrder then TempBGRA[i].SwapRedBlue;
-    {$ENDIF}
-    TargetList.Add(TempBGRA[i].Bitmap,nil);
-    TempBGRA[i].Free;
-  end;
-end;
-
-function DoScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer): integer;
-begin
-  if ToDPI = 0 then ToDPI := ScreenInfo.PixelsPerInchX;
-  if ToDPI <= FromDPI then
-    result := Size
-  else
-    Result := MulDiv(Size, ToDPI, FromDPI);
-end;
-
-function DoScaleY(Size: Integer; FromDPI: Integer; ToDPI: Integer): integer;
-begin
-  if ToDPI = 0 then ToDPI := ScreenInfo.PixelsPerInchY;
-  if ToDPI <= FromDPI then
-    result := Size
-  else
-    Result := MulDiv(Size, ToDPI, FromDPI);
-end;
-
-procedure ScaleDPI(Control: TControl; FromDPI: Integer; ToDPI_X, ToDPI_Y: integer);
-var
-  n: Integer;
-  WinControl: TWinControl;
-  ToolBarControl: TToolBar;
-begin
-  if ToDPI_X = 0 then ToDPI_X := ScreenInfo.PixelsPerInchX;
-  if ToDPI_Y = 0 then ToDPI_Y := ScreenInfo.PixelsPerInchY;
-  if ToDPI_X < FromDPI then ToDPI_X := FromDPI;
-  if ToDPI_Y < FromDPI then ToDPI_Y := FromDPI;
-  if (ToDPI_X = FromDPI) and (ToDPI_Y = FromDPI) then exit;
-
-  with Control do begin
-    Left:=DoScaleX(Left,FromDPI,ToDPI_X);
-    Top:=DoScaleY(Top,FromDPI,ToDPI_Y);
-    Width:=DoScaleX(Width,FromDPI,ToDPI_X);
-    Height:=DoScaleY(Height,FromDPI,ToDPI_Y);
-    {$IFDEF LCL Qt}
-      Font.Size := 0;
-    {$ELSE}
-      Font.Height := ScaleY(Font.GetTextHeight('Hg'),FromDPI);
-    {$ENDIF}
-  end;
-
-  if Control is TToolBar then begin
-    ToolBarControl:=TToolBar(Control);
-    with ToolBarControl do begin
-      ButtonWidth:=DoScaleX(ButtonWidth,FromDPI,ToDPI_X);
-      ButtonHeight:=DoScaleY(ButtonHeight,FromDPI,ToDPI_Y);
-    end;
-  end;
-
-  if Control is TWinControl then begin
-    WinControl:=TWinControl(Control);
-    with WinControl.ChildSizing do
-    begin
-      HorizontalSpacing := DoScaleX(HorizontalSpacing, FromDPI, ToDPI_X);
-      LeftRightSpacing := DoScaleX(LeftRightSpacing, FromDPI, ToDPI_X);
-      TopBottomSpacing := DoScaleY(TopBottomSpacing, FromDPI, ToDPI_Y);
-      VerticalSpacing := DoScaleY(VerticalSpacing, FromDPI, ToDPI_Y);
-    end;
-    if WinControl.ControlCount > 0 then begin
-      for n:=0 to WinControl.ControlCount-1 do begin
-        if WinControl.Controls[n] is TControl then begin
-          ScaleDPI(WinControl.Controls[n],FromDPI,ToDPI_X,ToDPI_Y);
-        end;
-      end;
-    end;
-  end;
-end;
-
-end.
+unit LCScaleDPI;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Forms, Graphics, Controls, ComCtrls;
+
+procedure ScaleForms(FromDPI: Integer);
+procedure ScaleControl(Control: TControl; FromDPI: Integer; ToDPI_X: Integer = 0; ToDPI_Y: Integer = 0);
+procedure ScaleImageList(SourceList: TImageList; newWidth, newHeight: Integer; TargetList: TImageList);
+function DoScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer;
+function DoScaleY(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer;
+
+implementation
+
+uses BGRABitmap, BGRABitmapTypes, LCLType;
+
+procedure ScaleForms(FromDPI: Integer);
+var
+  i: Integer;
+begin
+  for i:=0 to Screen.FormCount-1 do begin
+    ScaleControl(Screen.Forms[i],FromDPI);
+  end;
+end;
+
+procedure ScaleImageList(SourceList: TImageList; newWidth, newHeight: Integer; TargetList: TImageList);
+var
+  TempBmp: TBitmap;
+  TempBGRA: array of TBGRABitmap;
+  i: Integer;
+
+begin
+  setlength(TempBGRA, SourceList.Count);
+  TempBmp := TBitmap.Create;
+  for i := 0 to SourceList.Count-1 do
+  begin
+    SourceList.GetBitmap(i,TempBmp);
+    TempBGRA[i] := TBGRABitmap.Create(TempBmp);
+    TempBGRA[i].ResampleFilter := rfBestQuality;
+    if (TempBGRA[i].width=0) or (TempBGRA[i].height=0) then continue;
+    while (TempBGRA[i].Width < NewWidth) or (TempBGRA[i].Height < NewHeight) do
+      BGRAReplace(TempBGRA[i], TempBGRA[i].FilterSmartZoom3(moLowSmooth));
+    BGRAReplace(TempBGRA[i], TempBGRA[i].Resample(NewWidth,NewHeight));
+    BGRAReplace(TempBGRA[i], TempBGRA[i].FilterSharpen(0.50));
+  end;
+  TempBmp.Free;
+
+  TargetList.Clear;
+  TargetList.Width:= NewWidth;
+  TargetList.Height:= NewHeight;
+
+  for i := 0 to high(TempBGRA) do
+  begin
+    {$IFDEF LCLWin32}
+    If TBGRAPixel_RGBAOrder then TempBGRA[i].SwapRedBlue;
+    {$ENDIF}
+    TargetList.Add(TempBGRA[i].Bitmap,nil);
+    TempBGRA[i].Free;
+  end;
+end;
+
+function DoScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer): integer;
+begin
+  if ToDPI = 0 then ToDPI := ScreenInfo.PixelsPerInchX;
+  if ToDPI <= FromDPI then
+    result := Size
+  else
+    Result := MulDiv(Size, ToDPI, FromDPI);
+end;
+
+function DoScaleY(Size: Integer; FromDPI: Integer; ToDPI: Integer): integer;
+begin
+  if ToDPI = 0 then ToDPI := ScreenInfo.PixelsPerInchY;
+  if ToDPI <= FromDPI then
+    result := Size
+  else
+    Result := MulDiv(Size, ToDPI, FromDPI);
+end;
+
+procedure ScaleControl(Control: TControl; FromDPI: Integer; ToDPI_X: Integer; ToDPI_Y: integer);
+var
+  n: Integer;
+  WinControl: TWinControl;
+  ToolBarControl: TToolBar;
+begin
+  if ToDPI_X = 0 then ToDPI_X := ScreenInfo.PixelsPerInchX;
+  if ToDPI_Y = 0 then ToDPI_Y := ScreenInfo.PixelsPerInchY;
+  if ToDPI_X < FromDPI then ToDPI_X := FromDPI;
+  if ToDPI_Y < FromDPI then ToDPI_Y := FromDPI;
+  if (ToDPI_X = FromDPI) and (ToDPI_Y = FromDPI) then exit;
+
+  with Control do begin
+    Left:=DoScaleX(Left,FromDPI,ToDPI_X);
+    Top:=DoScaleY(Top,FromDPI,ToDPI_Y);
+    Width:=DoScaleX(Width,FromDPI,ToDPI_X);
+    Height:=DoScaleY(Height,FromDPI,ToDPI_Y);
+    {$IFDEF LCL Qt}
+      Font.Size := 0;
+    {$ELSE}
+      Font.Height := ScaleY(Font.GetTextHeight('Hg'),FromDPI);
+    {$ENDIF}
+  end;
+
+  if Control is TToolBar then begin
+    ToolBarControl:=TToolBar(Control);
+    with ToolBarControl do begin
+      ButtonWidth:=DoScaleX(ButtonWidth,FromDPI,ToDPI_X);
+      ButtonHeight:=DoScaleY(ButtonHeight,FromDPI,ToDPI_Y);
+    end;
+  end;
+
+  if Control is TWinControl then begin
+    WinControl:=TWinControl(Control);
+    with WinControl.ChildSizing do
+    begin
+      HorizontalSpacing := DoScaleX(HorizontalSpacing, FromDPI, ToDPI_X);
+      LeftRightSpacing := DoScaleX(LeftRightSpacing, FromDPI, ToDPI_X);
+      TopBottomSpacing := DoScaleY(TopBottomSpacing, FromDPI, ToDPI_Y);
+      VerticalSpacing := DoScaleY(VerticalSpacing, FromDPI, ToDPI_Y);
+    end;
+    if WinControl.ControlCount > 0 then begin
+      for n:=0 to WinControl.ControlCount-1 do begin
+        if WinControl.Controls[n] is TControl then begin
+          ScaleControl(WinControl.Controls[n],FromDPI,ToDPI_X,ToDPI_Y);
+        end;
+      end;
+    end;
+  end;
+end;
+
+end.

vectoredit/umain.pas

@@ -6,8 +6,7 @@ interface
 
 uses
   Classes, SysUtils, Types, FileUtil, Forms, Controls, Graphics, Dialogs,
-  LCLType, ExtCtrls, StdCtrls, ComCtrls, ExtDlgs, Menus, ActnList,
-  uscaledpi in {$IFDEF WINDOWS}'..\lazpaint\uscaledpi.pas'{$ELSE}'../lazpaint/uscaledpi.pas'{$ENDIF},
+  LCLType, ExtCtrls, StdCtrls, ComCtrls, ExtDlgs, Menus, ActnList, LCScaleDPI,
   BCTrackbarUpdown, BCPanel, BCButton, BGRAVirtualScreen, BGRAImageList,
   BGRABitmap, BGRABitmapTypes, BGRAGraphics, BGRALazPaint, BGRALayerOriginal,
   BGRATransform, BGRAGradientScanner, LCVectorOriginal, LCVectorShapes,

vectoredit/vectoredit.lpi

@@ -41,7 +41,7 @@
         <PackageName Value="LCL"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="4">
+    <Units Count="3">
       <Unit0>
         <Filename Value="vectoredit.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -57,11 +57,6 @@
         <Filename Value="uvectorclipboard.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
-      <Unit3>
-        <Filename Value="../lazpaint/uscaledpi.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="UScaleDPI"/>
-      </Unit3>
     </Units>
   </ProjectOptions>
   <CompilerOptions>