Changeset 246 for branches

Timestamp:

May 21, 2020, 8:17:38 PM (5 years ago)

Author:

chronos

Message:

• Modified: Update from trunk rev 245.
• Modified: Vcl prefix/suffix changed to Native.

Location:

branches/highdpi

Files:

• AI/Liberator/Liberator.ai.txt (modified) (1 diff)
• Back.lfm (modified) (1 diff)
• Back.pas (modified) (2 diffs)
• Database.pas (modified) (2 diffs)
• Direct.lfm (modified) (1 diff)
• GameServer.pas (modified) (1 diff)
• Inp.lfm (modified) (1 diff)
• Install/deb/debian/install (modified) (1 diff)
• Install/win/C-evo 32-bit.iss (added)
• Install/win/C-evo 64-bit.iss (added)
• Install/win/C-evo.iss (modified) (2 diffs)
• Install/win/Common.iss (added)
• Install/win/build.bat (modified) (2 diffs)
• Integrated.lpi (modified) (3 diffs)
• LocalPlayer/Battle.lfm (modified) ( previous)
• LocalPlayer/CityScreen.lfm (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (6 diffs)
• LocalPlayer/CityType.lfm (modified) ( previous)
• LocalPlayer/Diagram.lfm (modified) (1 diff)
• LocalPlayer/Draft.lfm (modified) (1 diff)
• LocalPlayer/Enhance.lfm (modified) ( previous)
• LocalPlayer/Help.lfm (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (2 diffs)
• LocalPlayer/IsoEngine.pas (modified) (2 diffs)
• LocalPlayer/MessgEx.lfm (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (4 diffs)
• LocalPlayer/NatStat.lfm (modified) (1 diff)
• LocalPlayer/Nego.lfm (modified) ( previous)
• LocalPlayer/Rates.lfm (modified) ( previous)
• LocalPlayer/Select.lfm (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (2 diffs)
• LocalPlayer/TechTree.lfm (modified) ( previous)
• LocalPlayer/TechTree.pas (modified) (5 diffs)
• LocalPlayer/Term.lfm (modified) (20 diffs)
• LocalPlayer/Term.pas (modified) (10 diffs)
• LocalPlayer/Wonders.lfm (modified) (1 diff)
• LocalPlayer/Wonders.pas (modified) (3 diffs)
• Locale.lfm (modified) (1 diff)
• Log.lfm (modified) (1 diff)
• Messg.lfm (modified) (1 diff)
• NoTerm.lfm (modified) ( previous)
• Packages/CevoComponents/CevoComponents.lpk (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (2 diffs)
• Packages/CevoComponents/DrawDlg.pas (modified) (3 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (24 diffs)
• Packages/CevoComponents/UPixelPointer.pas (modified) (2 diffs)
• Packages/DpiControls/UDpiControls.pas (modified) (124 diffs)
• Start.lfm (modified) (1 diff)
• Start.pas (modified) (6 diffs)

branches/highdpi/AI/Liberator/Liberator.ai.txt

@@ -1 +1 @@
 #NAME Liberator AI
 #GAMEVERSION 1.2.0
-#BEGINNER
 #PATH Liberator.dll
 #CREDITS Liberator AI by Dirk (http://c-evo.org/bb/viewtopic.php?f=5&t=162).

branches/highdpi/Back.lfm

@@ -18 +18 @@
   LCLVersion = '1.6.2.0'
   WindowState = wsMaximized
+  PixelsPerInch = 96
+  Scaled = False
 end

branches/highdpi/Back.pas

@@ -65 +65 @@
 begin
   if FullScreen then begin
-    WindowState := wsMaximized;
+    WindowState := wsFullScreen;
     if not Assigned(Img) then begin
       FileName := GetGraphicsDir + DirectorySeparator + 'Background.png';
@@ -75 +75 @@
   end else begin
     WindowState := wsNormal;
-    Width := StartDlg.Width + 16;
-    Height := StartDlg.Height + 16;
-    Left := StartDlg.Left - 8;
-    Top := StartDlg.Top - 8;
+    BoundsRect := Bounds(StartDlg.Left - 8, StartDlg.Top - 8,
+      StartDlg.Width + 16, StartDlg.Height + 16);
   end;
 end;

branches/highdpi/Database.pas

@@ -29 +29 @@
 
   CityOwnTile = 13;
+
+type
+  TGameMode = (moLoading_Fast, moLoading, moMovie, moPlaying);
 
 var
@@ -45 +48 @@
   GTurn: Integer; { current turn }
   GTestFlags: Integer;
-  Mode: (moLoading_Fast, moLoading, moMovie, moPlaying);
+  Mode: TGameMode;
   GWonder: array [0 .. 27] of TWonderInfo;
   ServerVersion: array [0 .. nPl - 1] of integer;

branches/highdpi/Direct.lfm

@@ -18 +18 @@
   OnShow = FormShow
   LCLVersion = '1.8.0.6'
+  PixelsPerInch = 96
+  Scaled = False
 end

branches/highdpi/GameServer.pas

@@ -4503 +4503 @@
 end; { <<<server }
 
+function ExtractFileNameWithoutExt(const Filename: string): string;
+var
+  P: Integer;
+begin
+  Result := Filename;
+  P := Length(Result);
+  while P > 0 do begin
+    case Result[P] of
+      PathDelim: Exit;
+      {$ifdef windows}
+      '/': if ('/' in AllowDirectorySeparators) then Exit;
+      {$endif}
+      '.': Exit(Copy(Result, 1, P - 1));
+    end;
+    Dec(P);
+  end;
+end;
+
 { TBrain }
 

branches/highdpi/Inp.lfm

@@ -17 +17 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object OKBtn: TButtonA
     Left = 66

branches/highdpi/Install/deb/debian/install

@@ -10 +10 @@
 Localization usr/share/c-evo
 Maps usr/share/c-evo
+Saved usr/share/c-evo
 
 AI/StdAI/StdAI.ai.txt usr/share/c-evo/AI/StdAI

branches/highdpi/Install/win/C-evo.iss

@@ -1 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "C-evo"
-#define MyAppVersion "1.2.0"
-#define MyAppPublisher "Chronosoft"
-#define MyAppPublisherShort "Chronosoft"
-#define MyAppURL "https://app.zdechov.net/c-evo"
-#define MyAppExeName "C-evo.exe"
-#define MyAppDebugName "C-evo.dbg"
-#define MyAppSubDir "../.."
+#include "Common.iss"
 
 [Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{6B40AF4D-C38C-4474-9614-8F0C4376C1CF}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion}
-UninstallDisplayName={#MyAppName}
-UninstallDisplayIcon="{app}\{#MyAppExeName}"
-VersionInfoVersion={#MyAppVersion}
-VersionInfoCompany={#MyAppPublisher}  
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DefaultGroupName={#MyAppName}
-AllowNoIcons=yes
-OutputDir=.
-OutputBaseFilename=Install-{#MyAppName}-{#MyAppVersion}
-Compression=lzma
-SolidCompression=yes
-ChangesAssociations=yes
 ; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
 ; done in "64-bit mode" on x64, meaning it should use the native
@@ -43 +10 @@
 ; installation to run on all architectures (including Itanium,
 ; since it's capable of running 32-bit code too).
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags:
-
-[Registry]
-Root: HKCU; Subkey: "Software\C-evo"; Flags: uninsdeletekey
-
-#define FileTypeName "C-evo book"
-Root: HKCR; Subkey: ".cevo"; ValueType: string; ValueName: ""; ValueData: "{#FileTypeName}"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "{#FileTypeName}"; ValueType: string; ValueName: ""; ValueData: "{#FileTypeName}"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#FileTypeName}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
-Root: HKCR; Subkey: "{#FileTypeName}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+OutputBaseFilename=Install-{#MyAppName}-{#MyAppVersion}
 
 [Components]
-Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixed
-Name: "maps"; Description: "Maps"; Types: full
-Name: "lang"; Description: "Language files"; Types: full
-Name: "lang\cs"; Description: "Czech"; Types: full
-Name: "lang\de"; Description: "German"; Types: full
-Name: "lang\it"; Description: "Italian"; Types: full
-Name: "lang\ru"; Description: "Russian"; Types: full
-Name: "lang\zhHans"; Description: "Chinese Simplified"; Types: full
-Name: "lang\zhHant"; Description: "Chinese Traditional"; Types: full
-Name: "ai"; Description: "AI files"; Types: full
-Name: "ai\stdai"; Description: "StdAI"; Types: full
-Name: "ai\ai_uo"; Description: "AI_UO"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\capital_ai"; Description: "Capital AI"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\aias"; Description: "AIAS"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\civseed"; Description: "Civilisation Seed AI"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\crystal"; Description: "Crystal"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\kiai"; Description: "KIAI"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\liberator"; Description: "Liberator"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\seti"; Description: "SETI"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai\shah"; Description: "Shah"; Types: full; Check: not Is64BitInstallMode; 
-Name: "ai_template"; Description: "AI template"; Types: full
+Name: "ai\ai_uo"; Description: "AI_UO"; Types: full
+Name: "ai\capital_ai"; Description: "Capital AI"; Types: full
+Name: "ai\aias"; Description: "AIAS"; Types: full
+Name: "ai\civseed"; Description: "Civilisation Seed AI"; Types: full
+Name: "ai\crystal"; Description: "Crystal"; Types: full
+Name: "ai\kiai"; Description: "KIAI"; Types: full
+Name: "ai\liberator"; Description: "Liberator"; Types: full
+Name: "ai\seti"; Description: "SETI"; Types: full
+Name: "ai\shah"; Description: "Shah"; Types: full
 
 [Files]
-Source: "{#MyAppSubDir}\lib\x86_64-win64-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode; Components: main
-Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode; Components: main
-Source: "{#MyAppSubDir}\Graphics\*"; DestDir: "{app}\Graphics"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\Sounds\*.*"; DestDir: "{app}\Sounds"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\Tribes\*.*"; DestDir: "{app}\Tribes"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\Localization\cs\*.*"; DestDir: "{app}\Localization\cs"; Flags: ignoreversion recursesubdirs; Components: lang\cs
-Source: "{#MyAppSubDir}\Localization\de\*.*"; DestDir: "{app}\Localization\de"; Flags: ignoreversion recursesubdirs; Components: lang\de
-Source: "{#MyAppSubDir}\Localization\it\*.*"; DestDir: "{app}\Localization\it"; Flags: ignoreversion recursesubdirs; Components: lang\it
-Source: "{#MyAppSubDir}\Localization\ru\*.*"; DestDir: "{app}\Localization\ru"; Flags: ignoreversion recursesubdirs; Components: lang\ru
-Source: "{#MyAppSubDir}\Localization\zh-Hans\*.*"; DestDir: "{app}\Localization\zh-Hans"; Flags: ignoreversion recursesubdirs; Components: lang\zhHans
-Source: "{#MyAppSubDir}\Localization\zh-Hant\*.*"; DestDir: "{app}\Localization\zh-Hant"; Flags: ignoreversion recursesubdirs; Components: lang\zhHant
-Source: "{#MyAppSubDir}\Help\*.*"; DestDir: "{app}\Help"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\Fonts.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\Language.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\Language2.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main
-Source: "{#MyAppSubDir}\AI Template\*.*"; DestDir: "{app}\AI Template"; Flags: ignoreversion recursesubdirs; Components: ai_template
-Source: "{#MyAppSubDir}\AI\StdAI\lib\x86_64-win64-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win64.dll"; Flags: ignoreversion; Components: ai\stdai
-Source: "{#MyAppSubDir}\AI\StdAI\lib\i386-win32-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win32.dll"; Flags: ignoreversion; Components: ai\stdai
-Source: "{#MyAppSubDir}\AI\StdAI\StdAI.png"; DestDir: "{app}\AI\StdAI"; Flags: ignoreversion; Components: ai\stdai
-Source: "{#MyAppSubDir}\AI\StdAI\StdAI.ai.txt"; DestDir: "{app}\AI\StdAI"; Flags: ignoreversion; Components: ai\stdai
-Source: "{#MyAppSubDir}\AI\AI_UO\*.*"; DestDir: "{app}\AI\AI_UO"; Flags: ignoreversion; Components: ai\ai_uo
-Source: "{#MyAppSubDir}\AI\AIAS\*.*"; DestDir: "{app}\AI\AIAS"; Flags: ignoreversion; Components: ai\aias
-Source: "{#MyAppSubDir}\AI\Capital AI\*.*"; DestDir: "{app}\AI\Capital AI"; Flags: ignoreversion; Components: ai\capital_ai
-Source: "{#MyAppSubDir}\AI\Civilisation Seed AI\*.*"; DestDir: "{app}\AI\Civilisation Seed AI"; Flags: ignoreversion; Components: ai\civseed
-Source: "{#MyAppSubDir}\AI\Crystal\*.*"; DestDir: "{app}\AI\Crystal"; Flags: ignoreversion; Components: ai\crystal
-Source: "{#MyAppSubDir}\AI\KIAI\*.*"; DestDir: "{app}\AI\KIAI"; Flags: ignoreversion; Components: ai\kiai
-Source: "{#MyAppSubDir}\AI\Liberator\*.*"; DestDir: "{app}\AI\Liberator"; Flags: ignoreversion; Components: ai\liberator
-Source: "{#MyAppSubDir}\AI\SETI\*.*"; DestDir: "{app}\AI\SETI"; Flags: ignoreversion; Components: ai\seti
-Source: "{#MyAppSubDir}\AI\Shah\*.*"; DestDir: "{app}\AI\Shah"; Flags: ignoreversion; Components: ai\shah
-Source: "{#MyAppSubDir}\Maps\*.*"; DestDir: "{localappdata}\c-evo\Maps"; Flags: ignoreversion; Components: maps
-Source: "{#MyAppSubDir}\Saved\*.*"; DestDir: "{localappdata}\c-evo\Saved"; Flags: ignoreversion; Components: main
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait postinstall skipifsilent
-
+Source: "{#MyAppSubDir}\lib\x86_64-win64-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Components: main; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Components: main; Check: Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\StdAI\lib\i386-win32-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win32.dll"; Flags: ignoreversion; Components: ai\stdai; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\StdAI\lib\x86_64-win64-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win64.dll"; Flags: ignoreversion; Components: ai\stdai; Check: Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\AI_UO\*.*"; DestDir: "{app}\AI\AI_UO"; Flags: ignoreversion; Components: ai\ai_uo; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\AIAS\*.*"; DestDir: "{app}\AI\AIAS"; Flags: ignoreversion; Components: ai\aias; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\Capital AI\*.*"; DestDir: "{app}\AI\Capital AI"; Flags: ignoreversion; Components: ai\capital_ai; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\Civilisation Seed AI\*.*"; DestDir: "{app}\AI\Civilisation Seed AI"; Flags: ignoreversion; Components: ai\civseed; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\Crystal\*.*"; DestDir: "{app}\AI\Crystal"; Flags: ignoreversion; Components: ai\crystal; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\KIAI\*.*"; DestDir: "{app}\AI\KIAI"; Flags: ignoreversion; Components: ai\kiai; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\Liberator\*.*"; DestDir: "{app}\AI\Liberator"; Flags: ignoreversion; Components: ai\liberator; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\SETI\*.*"; DestDir: "{app}\AI\SETI"; Flags: ignoreversion; Components: ai\seti; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\AI\Shah\*.*"; DestDir: "{app}\AI\Shah"; Flags: ignoreversion; Components: ai\shah; Check: not Is64BitInstallMode

branches/highdpi/Install/win/build.bat

@@ -4 +4 @@
   set LAZDIR=C:\lazarus
 )
+
+set INNO_SETUP="c:\Program Files (x86)\Inno Setup 6\ISCC.exe"
 
 rem Build AI
@@ -33 +35 @@
 copy %MAIN_EXE% %WIN64_EXE%
 
-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "C-evo.iss"
+%INNO_SETUP% "C-evo.iss"
+%INNO_SETUP% "C-evo 32-bit.iss"
+%INNO_SETUP% "C-evo 64-bit.iss"

branches/highdpi/Integrated.lpi

@@ -16 +16 @@
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <XPManifest>
-        <DpiAware Value="True"/>
-      </XPManifest>
       <Icon Value="0"/>
       <Resources Count="2">
@@ -143 +140 @@
         <ComponentName Value="StartDlg"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit8>
       <Unit9>
@@ -163 +161 @@
         <ComponentName Value="Background"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit11>
       <Unit12>

branches/highdpi/LocalPlayer/CityScreen.lfm

@@ -21 +21 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object CloseBtn: TButtonA
     Left = 335

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -435 +435 @@
     end;
   end;
-
-  procedure MakeRed(X, Y, W, H: Integer);
-  var
-    XX, YY: Integer;
-    Gray: Integer;
-    PixelPtr: TPixelPointer;
-  begin
-    X := ScaleToVcl(X);
-    Y := ScaleToVcl(Y);
-    W := ScaleToVcl(W);
-    H := ScaleToVcl(H);
-    Offscreen.BeginUpdate;
-    PixelPtr := PixelPointer(Offscreen, X, Y);
-    for YY := 0 to H - 1 do begin
-      for XX := 0 to W - 1 do begin
-        Gray := (Integer(PixelPtr.Pixel^.B) + Integer(PixelPtr.Pixel^.G) +
-        Integer(PixelPtr.Pixel^.R)) * 85 shr 8;
-        PixelPtr.Pixel^.B := 0;
-        PixelPtr.Pixel^.G := 0;
-        PixelPtr.Pixel^.R := Gray; // 255-(255-gray) div 2;
-        PixelPtr.NextPixel;
-      end;
-      PixelPtr.NextLine;
-    end;
-    Offscreen.EndUpdate;
-  end;
-
 var
   line, MessageCount: integer;
@@ -565 +538 @@
   if not IsCityAlive then
   begin
-    MakeRed(18, 280, 298, 40);
+    MakeRed(Offscreen, 18, 280, 298, 40);
     if cGov = gAnarchy then
       s := Phrases.Lookup('GOVERNMENT', gAnarchy)
@@ -701 +674 @@
     else
     begin
-      MakeRed(xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
+      MakeRed(Offscreen, xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
       CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
         Phrases.Lookup('LACK'), -Report.HappinessBalance, RedTex);
@@ -726 +699 @@
     else
     begin
-      MakeRed(xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
+      MakeRed(Offscreen, xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
       CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
         Phrases.Lookup('LACK'), -Report.FoodSurplus, RedTex);
@@ -759 +732 @@
     else
     begin
-      MakeRed(xProd + dxBar - 6, yProd + dyBar + 17, wBar + 10, 38);
+      MakeRed(Offscreen, xProd + dxBar - 6, yProd + dyBar + 17, wBar + 10, 38);
       CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
         Phrases.Lookup('LACK'), -Report.Production, RedTex);
@@ -1684 +1657 @@
   end
   else
+  if OpenSoundEvent >= 0 then
     Play(CityEventSoundItem[OpenSoundEvent]);
   OpenSoundEvent := -2;

branches/highdpi/LocalPlayer/Diagram.lfm

@@ -18 +18 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object CloseBtn: TButtonB
     Left = 380

branches/highdpi/LocalPlayer/Draft.lfm

@@ -19 +19 @@
   OnShow = FormShow
   LCLVersion = '1.6.0.4'
+  PixelsPerInch = 96
+  Scaled = False
   object OKBtn: TButtonA
     Left = 196

branches/highdpi/LocalPlayer/Help.lfm

@@ -22 +22 @@
   OnPaint = FormPaint
   PixelsPerInch = 96
+  Scaled = False
   object CloseBtn: TButtonB
     Left = 522

branches/highdpi/LocalPlayer/Help.pas

@@ -443 +443 @@
   MaxSum = 9 * 9 * 255 * 75 div 100;
 var
-  x, y, dx, dy, xSrc, ySrc, Sum, xx: integer;
+  x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
   Heaven: array [0..nHeaven] of integer;
-  PaintPtr: TPixelPointer;
-  CoalPtr: TPixelPointer;
+  PaintPtr, CoalPtr: TPixelPointer;
   ImpPtr: array [-1..1] of TPixelPointer;
 begin
@@ -458 +457 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ScaleToVcl(ySizeBig * 2) - 1 do
-    if ((ScaleToVcl(y0) + y) >= 0) and ((ScaleToVcl(y0) + y) < ScaleToVcl(InnerHeight)) then begin
-      PaintPtr := PixelPointer(OffScreen, 0, ScaleToVcl(y0) + y);
-      CoalPtr := PixelPointer(Templates, 0, ScaleToVcl(yCoal) + y);
+  for y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do
+    if ((ScaleToNative(y0) + y) >= 0) and ((ScaleToNative(y0) + y) < ScaleToNative(InnerHeight)) then begin
+      PaintPtr := PixelPointer(OffScreen, 0, ScaleToNative(y0) + y);
+      CoalPtr := PixelPointer(Templates, 0, ScaleToNative(yCoal) + y);
       for dy := -1 to 1 do
-        if ((Max(y + ScaleToVcl(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToVcl(dy), 0) shr 1) < ScaleToVcl(ySizeBig)) then
-          ImpPtr[dy] := PixelPointer(BigImp, 0, ScaleToVcl(ySrc) + (Max(y + ScaleToVcl(dy), 0) shr 1));
-      for x := 0 to ScaleToVcl(xSizeBig * 2) - 1 do begin
-        Sum := 0;
+        if ((Max(y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
+          ImpPtr[dy] := PixelPointer(BigImp, 0, ScaleToNative(ySrc) + (Max(y + ScaleToNative(dy), 0) shr 1));
+      for x := 0 to ScaleToNative(xSizeBig) * 2 - 1 do begin
+        sum := 0;
         for dx := -1 to 1 do begin
-          xx := ScaleToVcl(xSrc) + Max((x + ScaleToVcl(dx)), 0) shr 1;
+          xx := ScaleToNative(xSrc) + Max((x + ScaleToNative(dx)), 0) shr 1;
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
-            if ((y + ScaleToVcl(dy)) shr 1 < 0) or ((y + ScaleToVcl(dy)) shr 1 >= ScaleToVcl(ySizeBig)) or
-              ((x + ScaleToVcl(dx)) shr 1 < 0) or ((x + ScaleToVcl(dx)) shr 1 >= ScaleToVcl(xSizeBig)) or
-              ((y + ScaleToVcl(dy)) shr 1 < ScaleToVcl(nHeaven)) and
+            if ((y + ScaleToNative(dy)) shr 1 < 0) or ((y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
+              ((x + ScaleToNative(dx)) shr 1 < 0) or ((x + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
+              ((y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
               (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromVcl(y) + dy) shr 1]) then
-              Sum := Sum + 9 * 255
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y) + dy) shr 1]) then
+              sum := sum + 9 * 255
             else
-              Sum := Sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
+              sum := sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
                 ImpPtr[dy].Pixel^.R;
           end;
         end;
-        if Sum < MaxSum then begin // no saturation
-          CoalPtr.SetX(ScaleToVcl(xCoal) + x);
-          Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
+        if sum < MaxSum then begin // no saturation
+          CoalPtr.SetX(ScaleToNative(xCoal) + x);
+          sum := 1 shl 22 - (MaxSum - sum) * (256 - CoalPtr.Pixel^.B * 2);
           PaintPtr.SetX(x0 + x);
-          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * Sum shr 22;
-          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * Sum shr 22;
-          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * Sum shr 22;
+          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * sum shr 22;
+          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * sum shr 22;
+          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * sum shr 22;
         end;
       end;

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -1015 +1015 @@
             1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
           Borders.BeginUpdate;
-          PixelPtr := PixelPointer(Borders, ScaleToVcl(0), ScaleToVcl(p1 * (yyt * 2)));
-          for dy := 0 to ScaleToVcl(yyt * 2) - 1 do begin
-            for dx := 0 to ScaleToVcl(xxt * 2) - 1 do begin
+          PixelPtr := PixelPointer(Borders, ScaleToNative(0), ScaleToNative(p1 * (yyt * 2)));
+          for dy := 0 to ScaleToNative(yyt * 2) - 1 do begin
+            for dx := 0 to ScaleToNative(xxt * 2) - 1 do begin
               if PixelPtr.Pixel^.B = 99 then begin
                 PixelPtr.Pixel^.B := Tribe[p1].Color shr 16 and $FF;
@@ -1339 +1339 @@
 begin
   FOutput.BeginUpdate;
-  Line := PixelPointer(FOutput, ScaleToVcl(x0), ScaleToVcl(y0));
-  for y := 0 to ScaleToVcl(Height) - 1 do begin
-    y_n := (ScaleFromVcl(y) + y0 - ym) / yyt;
-    if Abs(y_n) < rShade then begin
+  Line := PixelPointer(FOutput, ScaleToNative(x0), ScaleToNative(y0));
+  for y := 0 to ScaleToNative(Height) - 1 do begin
+    y_n := (ScaleFromNative(y) + y0 - ym) / yyt;
+    if abs(y_n) < rShade then begin
       // Darken left and right parts of elipsis
-      w_n := Sqrt(Sqr(rShade) - Sqr(y_n));
-      wBright := Trunc(w_n * xxt + 0.5);
+      w_n := sqrt(sqr(rShade) - sqr(y_n));
+      wBright := trunc(w_n * xxt + 0.5);
       Line.SetX(0);
-      MakeDark(@Line, ScaleToVcl(xm - wBright));
-      Line.SetX(ScaleToVcl(xm + wBright));
-      MakeDark(@Line, ScaleToVcl(Width - xm - wBright));
+      MakeDark(@Line, ScaleToNative(xm - wBright));
+      Line.SetX(ScaleToNative(xm + wBright));
+      MakeDark(@Line, ScaleToNative(Width - xm - wBright));
     end else begin
       // Darken entire line
       Line.SetX(0);
-      MakeDark(@Line, ScaleToVcl(Width));
+      MakeDark(@Line, ScaleToNative(Width));
     end;
     Line.NextLine;

branches/highdpi/LocalPlayer/MessgEx.lfm

@@ -20 +20 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object Button1: TButtonA
     Left = 43

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -212 +212 @@
         Sleep(1);
         Ticks := NowPrecise;
-      until MovieCancelled or (MillisecondOf(Ticks - Ticks0) >= 1500);
+      until MovieCancelled or (Round((Ticks - Ticks0) / OneMillisecond) >= 1500);
       Hide;
     end;
@@ -237 +237 @@
   Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
   SrcPtr: TPixelPointer;
-begin
+  Width: Integer;
+  Height: Integer;
+begin
+  Width := 56;
+  Height := 40;
   if IconIndex >= 0 then begin
     xIcon := IconIndex mod 7 * xSizeBig;
     yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
     // prepare screwed icon
-    fillchar(Screwed, sizeof(Screwed), 0);
+    FillChar(Screwed, sizeof(Screwed), 0);
     BigImp.BeginUpdate;
-    for iy := 0 to 39 do begin
-      for ix := 0 to 55 do begin
-        SrcPtr := PixelPointer(BigImp, ix + xIcon, iy + yIcon);
-        xR := ix * (37 + iy * 5 / 40) / 56;
+    SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
+    for iy := 0 to ScaleToNative(Height) - 1 do begin
+      for ix := 0 to ScaleToNative(Width) - 1 do begin
+        xR := ScaleFromNative(ix) * (37 + ScaleFromNative(iy) * 5 / Height) / Width;
         xDst := Trunc(xR);
         xR := Frac(xR);
-        x1 := (120 - ix) * (120 - ix) - 10000;
-        yR := iy * 18 / 40 + x1 * x1 / 4000000;
+        x1 := (120 - ScaleFromNative(ix)) * (120 - ScaleFromNative(ix)) - 10000;
+        yR := ScaleFromNative(iy) * 18 / Height + x1 * x1 / 4000000;
         yDst := Trunc(yR);
         yR := Frac(yR);
@@ -272 +276 @@
             Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
               3] + share;
-          end;
-      end;
+        end;
+        SrcPtr.NextPixel;
+      end;
+      SrcPtr.NextLine;
     end;
     BigImp.EndUpdate;
@@ -373 +379 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
+        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+        Buffer.Canvas.FillRect(0, 0, 1, 1);
         DpiBitCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,

branches/highdpi/LocalPlayer/NatStat.lfm

@@ -17 +17 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object ToggleBtn: TButtonB
     Left = 6

branches/highdpi/LocalPlayer/Select.lfm

@@ -23 +23 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object CloseBtn: TButtonB
     Left = 343

branches/highdpi/LocalPlayer/Select.pas

@@ -578 +578 @@
                     295 + (AdvIcon[lix] - 84) div 8 * 21);
                 j := AdvValue[lix] div 1000;
-                DpiBitCanvas(Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
+                DpiBitCanvas(offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
                   GrExt[HGrSystem].Mask.Canvas, 127 + j * 15,
                   85, SRCAND);
@@ -754 +754 @@
         end;
       end;
+
     for i := -1 to DispLines do
       if (i + sb.Position >= 0) and (i + sb.Position < Lines[Layer]) then

branches/highdpi/LocalPlayer/TechTree.pas

@@ -9 +9 @@
 
 type
+
+  { TTechTreeDlg }
+
   TTechTreeDlg = class(TDrawDlg)
     CloseBtn: TButtonB;
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -24 +28 @@
     xOffset, yOffset, xDown, yDown: Integer;
     Image: TDpiBitmap;
-    dragging: boolean;
+    Dragging: Boolean;
   end;
 
@@ -72 +76 @@
   InitButtons;
   Image := nil;
+end;
+
+procedure TTechTreeDlg.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(Image);
 end;
 
@@ -121 +130 @@
   X, Y, ad: Integer;
   s: string;
+  NewWidth: Integer;
+  NewHeight: Integer;
 const
   TransparentColor = $7F007F;
@@ -164 +175 @@
 
   // fit window to image, center image in window, center window to screen
-  width := min(DpiScreen.width - 40, Image.width + LeftBorder + RightBorder + 2 *
-    BlackBorder);
-  height := min(DpiScreen.height - 40, Image.height + TopBorder + BottomBorder + 2
-    * BlackBorder);
-  Left := (DpiScreen.width - width) div 2;
-  Top := (DpiScreen.height - height) div 2;
+  NewWidth := Min(DpiScreen.Width - 40, Image.Width + LeftBorder + RightBorder + 2 * BlackBorder);
+  NewHeight := Min(DpiScreen.Height - 40, Image.Height + TopBorder + BottomBorder + 2 * BlackBorder);
+  BoundsRect := Bounds((DpiScreen.Width - NewWidth) div 2,
+    (DpiScreen.Height - NewHeight) div 2,
+    NewWidth, NewHeight);
   CloseBtn.Left := width - CloseBtn.width - BlackBorder - 8;
   CloseBtn.Top := BlackBorder + 8;
-  xOffset := (ClientWidth - Image.width + LeftBorder - RightBorder) div 2 -
+  xOffset := (ClientWidth - Image.Width + LeftBorder - RightBorder) div 2 -
     BlackBorder;
-  yOffset := ClientHeight - 2 * BlackBorder - Image.height - BottomBorder;
+  yOffset := ClientHeight - 2 * BlackBorder - Image.Height - BottomBorder;
 end;
 

branches/highdpi/LocalPlayer/Term.lfm

@@ -1 +1 @@
 object MainScreen: TMainScreen
   Left = 231
-  Height = 600
+  Height = 480
   Top = 190
-  Width = 1000
+  Width = 800
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   Caption = 'C-evo'
-  ClientHeight = 600
-  ClientWidth = 1000
+  ClientHeight = 480
+  ClientWidth = 800
   Color = clBtnFace
-  Constraints.MinHeight = 600
-  Constraints.MinWidth = 1000
-  DesignTimePPI = 120
+  Constraints.MinHeight = 480
+  Constraints.MinWidth = 800
   Font.Color = clWindowText
-  Font.Height = -16
+  Font.Height = -13
   Font.Name = 'MS Sans Serif'
   KeyPreview = True
@@ -31 +30 @@
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '2.0.6.0'
+  PixelsPerInch = 96
+  Scaled = False
+  LCLVersion = '1.6.0.4'
   WindowState = wsMaximized
   object UnitBtn: TButtonB
     Tag = 14
-    Left = 260
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 208
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -47 +48 @@
   object MapBtn0: TButtonC
     Tag = 51
-    Left = 20
-    Height = 15
-    Top = 380
-    Width = 15
+    Left = 16
+    Height = 12
+    Top = 304
+    Width = 12
     Visible = False
     Down = False
@@ -59 +60 @@
   object MapBtn1: TButtonC
     Tag = 291
-    Left = 20
-    Height = 15
-    Top = 400
-    Width = 15
+    Left = 16
+    Height = 12
+    Top = 320
+    Width = 12
     Visible = False
     Down = False
@@ -71 +72 @@
   object MapBtn4: TButtonC
     Tag = 1028
-    Left = 20
-    Height = 15
-    Top = 460
-    Width = 15
+    Left = 16
+    Height = 12
+    Top = 368
+    Width = 12
     Visible = False
     Down = False
@@ -83 +84 @@
   object MapBtn5: TButtonC
     Tag = 1328
-    Left = 20
-    Height = 15
-    Top = 480
-    Width = 15
+    Left = 16
+    Height = 12
+    Top = 384
+    Width = 12
     Visible = False
     Down = False
@@ -95 +96 @@
   object MapBtn6: TButtonC
     Tag = 1541
-    Left = 20
-    Height = 15
-    Top = 500
-    Width = 15
+    Left = 16
+    Height = 12
+    Top = 400
+    Width = 12
     Visible = False
     Down = False
@@ -107 +108 @@
   object TerrainBtn: TButtonB
     Tag = 28
-    Left = 300
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 240
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -119 +120 @@
   object UnitInfoBtn: TButtonB
     Tag = 15
-    Left = 220
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 176
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -130 +131 @@
   end
   object EOT: TEOTButton
-    Left = 890
-    Height = 60
-    Top = 460
-    Width = 60
+    Left = 712
+    Height = 48
+    Top = 368
+    Width = 48
     Visible = False
     Down = False
@@ -142 +143 @@
   object MenuArea: TArea
     Left = 2
-    Height = 45
+    Height = 36
     Top = 1
-    Width = 45
+    Width = 36
   end
   object TreasuryArea: TArea
-    Left = 260
-    Height = 45
+    Left = 208
+    Height = 36
     Top = 1
-    Width = 205
+    Width = 164
   end
   object ResearchArea: TArea
-    Left = 480
-    Height = 45
+    Left = 384
+    Height = 36
     Top = 1
-    Width = 300
+    Width = 240
   end
   object ManagementArea: TArea
-    Left = 880
-    Height = 50
-    Top = 390
-    Width = 70
+    Left = 704
+    Height = 40
+    Top = 312
+    Width = 56
   end
   object MovieSpeed1Btn: TButtonB
     Tag = 256
-    Left = 480
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 384
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -178 +179 @@
   object MovieSpeed2Btn: TButtonB
     Tag = 512
-    Left = 520
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 416
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -190 +191 @@
   object MovieSpeed3Btn: TButtonB
     Tag = 768
-    Left = 560
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 448
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -202 +203 @@
   object MovieSpeed4Btn: TButtonB
     Tag = 1024
-    Left = 600
-    Height = 31
-    Top = 480
-    Width = 31
+    Left = 480
+    Height = 25
+    Top = 384
+    Width = 25
     Visible = False
     Down = False
@@ -216 +217 @@
     Interval = 50
     OnTimer = Timer1Timer
-    left = 10
-    top = 60
+    left = 8
+    top = 48
   end
   object GamePopup: TDpiPopupMenu
     AutoPopup = False
-    left = 50
-    top = 60
+    left = 40
+    top = 48
     object mHelp: TDpiMenuItem
       Tag = 7
@@ -458 +459 @@
           RadioItem = True
           OnClick = mBigTilesClick
-        end
+        end             
       end
       object mSound: TDpiMenuItem
@@ -586 +587 @@
   object UnitPopup: TDpiPopupMenu
     AutoPopup = False
-    left = 130
-    top = 60
+    left = 104
+    top = 48
     object mdisband: TDpiMenuItem
       Tag = 72
@@ -669 +670 @@
   object StatPopup: TDpiPopupMenu
     AutoPopup = False
-    left = 90
-    top = 60
+    left = 72
+    top = 48
     object mUnitStat: TDpiMenuItem
       Tag = 9
@@ -725 +726 @@
   end
   object EditPopup: TDpiPopupMenu
-    left = 210
-    top = 60
+    left = 168
+    top = 48
     object mCreateUnit: TDpiMenuItem
       Tag = 47
@@ -732 +733 @@
   end
   object TerrainPopup: TDpiPopupMenu
-    left = 170
-    top = 60
+    left = 136
+    top = 48
     object mtrans: TDpiMenuItem
       Tag = 273

branches/highdpi/LocalPlayer/Term.pas

@@ -287 +287 @@
     Offscreen: TDpiBitmap;
     OffscreenUser: TDpiForm;
-    procedure CreateParams(var p: TCreateParams); override;
     procedure Client(Command, NewPlayer: integer; var Data);
     procedure SetAIName(p: integer; Name: string);
@@ -532 +531 @@
   SmallScreen, GameOK, MapValid, skipped, idle: boolean;
 
-  SaveOption: array [0..nSaveOption - 1] of integer;
-  MiniColors: array [0..fTerrain, 0..1] of TColor;
+  SaveOption: array [0 .. nSaveOption - 1] of integer;
+  MiniColors: array [0 .. 11, 0 .. 1] of TColor;
   MainMap: TIsoMap;
   CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;
@@ -555 +554 @@
   Sharpen = 80;
 type
-  TBuffer = array [0 .. 99999, 0 .. 2] of integer;
+  TBuffer = array [0 .. 99999, 0 .. 2] of Integer;
 var
-  sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch, xdivider,
-    ydivider: integer;
-  resampled: ^TBuffer;
+  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch: Integer;
+  xdivider, ydivider: Integer;
+  Resampled: ^TBuffer;
   PixelPtr: TPixelPointer;
 begin
-  nx := BigImp.width div xSizeBig * xSizeSmall;
-  ny := BigImp.height div ySizeBig * ySizeSmall;
+  nx := BigImp.Width div xSizeBig * xSizeSmall;
+  ny := BigImp.Height div ySizeBig * ySizeSmall;
 
   // resample icons
-  GetMem(resampled, nx * ny * 12);
-  FillChar(resampled^, nx * ny * 12, 0);
+  GetMem(Resampled, nx * ny * 12);
+  FillChar(Resampled^, nx * ny * 12, 0);
   BigImp.BeginUpdate;
-  for ix := 0 to BigImp.width div xSizeBig - 1 do
-    for iy := 0 to BigImp.height div ySizeBig - 1 do
-      for y := 0 to ySizeBig - 2 * cut - 1 do
-      begin
-        ydivider := (y * ySizeSmall div (ySizeBig - 2 * cut) + 1) *
-          (ySizeBig - 2 * cut) - y * ySizeSmall;
+  for ix := 0 to BigImp.Width div xSizeBig - 1 do
+    for iy := 0 to BigImp.Height div ySizeBig - 1 do begin
+      PixelPtr := PixelPointer(BigImp, ScaleToNative(ix * xSizeBig),
+        ScaleToNative(cut + iy * ySizeBig));
+      for y := 0 to ScaleToNative(ySizeBig - 2 * cut) - 1 do begin
+        ydivider := (ScaleFromNative(y) * ySizeSmall div (ySizeBig - 2 * cut) + 1) *
+          (ySizeBig - 2 * cut) - ScaleFromNative(y) * ySizeSmall;
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        PixelPtr := PixelPointer(BigImp, 0, cut + iy * ySizeBig + y);
-        for x := 0 to xSizeBig - 1 do
-        begin
-          ir := ix * xSizeSmall + iy * nx * ySizeSmall + x *
-            xSizeSmall div xSizeBig + y *
+        for x := 0 to ScaleToNative(xSizeBig) - 1 do begin
+          ir := ix * xSizeSmall + iy * nx * ySizeSmall + ScaleFromNative(x) *
+            xSizeSmall div xSizeBig + ScaleFromNative(y) *
             ySizeSmall div (ySizeBig - 2 * cut) * nx;
-          xdivider := (x * xSizeSmall div xSizeBig + 1) * xSizeBig - x *
-            xSizeSmall;
+          xdivider := (ScaleFromNative(x) * xSizeSmall div xSizeBig + 1) *
+            xSizeBig - ScaleFromNative(x) * xSizeSmall;
           if xdivider > xSizeSmall then
             xdivider := xSizeSmall;
-          for ch := 0 to 2 do
-          begin
-            PixelPtr.SetX(ix * xSizeBig + x);
+          for ch := 0 to 2 do begin
             c := PixelPtr.Pixel^.Planes[ch];
-            inc(resampled[ir, ch], c * xdivider * ydivider);
+            Inc(Resampled[ir, ch], c * xdivider * ydivider);
             if xdivider < xSizeSmall then
-              inc(resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
                 ydivider);
             if ydivider < ySizeSmall then
-              inc(resampled[ir + nx, ch],
+              Inc(Resampled[ir + nx, ch],
                 c * xdivider * (ySizeSmall - ydivider));
             if (xdivider < xSizeSmall) and (ydivider < ySizeSmall) then
-              inc(resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
                 (ySizeSmall - ydivider));
           end;
+          PixelPtr.NextPixel;
         end;
+        PixelPtr.NextLine;
       end;
+    end;
   BigImp.EndUpdate;
 
-  // sharpen resampled icons
+  // Sharpen Resampled icons
   SmallImp.SetSize(nx, ny);
   SmallImp.BeginUpdate;
-  for y := 0 to ny - 1 do begin
-    PixelPtr := PixelPointer(SmallImp, 0, y);
-    for x := 0 to nx - 1 do
+  PixelPtr := PixelPointer(SmallImp);
+  for y := 0 to ScaleToNative(ny) - 1 do begin
+    for x := 0 to ScaleToNative(nx) - 1 do begin
       for ch := 0 to 2 do begin
-        sum := 0;
+        Sum := 0;
         Cnt := 0;
         for dy := -1 to 1 do
-          if ((dy >= 0) or (y mod ySizeSmall > 0)) and
-            ((dy <= 0) or (y mod ySizeSmall < ySizeSmall - 1)) then
+          if ((dy >= 0) or (ScaleFromNative(y) mod ySizeSmall > 0)) and
+            ((dy <= 0) or (ScaleFromNative(y) mod ySizeSmall < ySizeSmall - 1)) then
             for dx := -1 to 1 do
-              if ((dx >= 0) or (x mod xSizeSmall > 0)) and
-                ((dx <= 0) or (x mod xSizeSmall < xSizeSmall - 1)) then
+              if ((dx >= 0) or (ScaleFromNative(x) mod xSizeSmall > 0)) and
+                ((dx <= 0) or (ScaleFromNative(x) mod xSizeSmall < xSizeSmall - 1)) then
               begin
-                inc(sum, resampled[x + dx + nx * (y + dy), ch]);
-                inc(Cnt);
+                Inc(Sum, Resampled[ScaleFromNative(x) + dx + nx * (ScaleFromNative(y) + dy), ch]);
+                Inc(Cnt);
               end;
-        sum := ((Cnt * Sharpen + 800) * resampled[x + nx * y, ch] - sum *
+        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(x) + nx * ScaleFromNative(y), ch] - Sum *
           Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * cut));
-        if sum < 0 then sum := 0;
-        if sum > 255 then sum := 255;
-        PixelPtr.SetX(x);
-        PixelPtr.Pixel^.Planes[ch] := sum;
+        if Sum < 0 then Sum := 0;
+        if Sum > 255 then Sum := 255;
+        PixelPtr.Pixel^.Planes[ch] := Sum;
       end;
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
   end;
   SmallImp.EndUpdate;
-  FreeMem(resampled);
+  FreeMem(Resampled);
 end;
 
@@ -3399 +3400 @@
 { *** main part *** }
 
-procedure TMainScreen.CreateParams(var p: TCreateParams);
-begin
-  inherited;
-  if FullScreen then begin
-    p.Style := $87000000;
-    BorderStyle := bsNone;
-    BorderIcons := [];
-  end;
-end;
-
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
@@ -4077 +4068 @@
   MiniPixel := PixelPointer(Mini);
   PrevMiniPixel := PixelPointer(Mini);
-  for y := 0 to ScaleToVcl(G.ly) - 1 do
-  begin
-    for x := 0 to ScaleToVcl(G.lx) - 1 do
-      if MyMap[ScaleFromVcl(x) + G.lx * ScaleFromVcl(y)] and fTerrain <> fUNKNOWN then
-      begin
-        Loc := ScaleFromVcl(x) + G.lx * ScaleFromVcl(y);
+  for y := 0 to ScaleToNative(G.ly) - 1 do
+  begin
+    for x := 0 to ScaleToNative(G.lx) - 1 do
+      if MyMap[ScaleFromNative(x) + G.lx * ScaleFromNative(y)] and fTerrain <> fUNKNOWN then
+      begin
+        Loc := ScaleFromNative(x) + G.lx * ScaleFromNative(y);
         for i := 0 to 1 do
         begin
-          xm := ((x - ScaleToVcl(xwMini)) * 2 + i + y and 1 - ScaleToVcl(hw) +
-            ScaleToVcl(G.lx) * 5) mod (ScaleToVcl(G.lx) * 2);
+          xm := ((x - ScaleToNative(xwMini)) * 2 + i + y and 1 - ScaleToNative(hw) +
+            ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
           MiniPixel.SetXY(xm, y);
           cm := MiniColors[MyMap[Loc] and fTerrain, i];
@@ -6092 +6083 @@
       NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
       PaintBufferToScreen(xMin, yMin, xRange, yRange);
+      {$IFDEF LINUX}
+      // TODO: Force animation under linux
+      DpiApplication.ProcessMessages;
+      {$ENDIF}
 
       SliceCount := 0;
@@ -6097 +6092 @@
       repeat
         if (SliceCount = 0) or
-          (MillisecondOf(Ticks - Ticks0) * 12 * (SliceCount + 1) div SliceCount
+          (Round(((Ticks - Ticks0) * 12) / OneMillisecond) * (SliceCount + 1) div SliceCount
           < MoveTime) then
         begin
           if not idle or (GameMode = cMovie) then
             DpiApplication.ProcessMessages;
-          {$IFDEF LINUX}
-          // TODO: Force animation under linux
-          DpiApplication.ProcessMessages;
-          {$ENDIF}
           Sleep(1);
           inc(SliceCount)
         end;
         Ticks := NowPrecise;
-      until (Ticks - Ticks0) / OneMillisecond * 12 >= MoveTime;
+      until (((Ticks - Ticks0) * 12) / OneMillisecond) >= MoveTime;
       Ticks0 := Ticks
     end;
@@ -6551 +6542 @@
           time1 := NowPrecise;
           SimpleMessage(Format('Map repaint time: %.3f ms',
-            [MillisecondOf(time1 - time0)]));
+            [(time1 - time0) / OneMillisecond]));
         end
     end
@@ -7628 +7619 @@
         InitPopup(GamePopup);
         if FullScreen then
-          // GamePopup.FItems.Count
           GamePopup.Popup(Left, Top + TopBarHeight - 1)
         else
@@ -7807 +7797 @@
 procedure TMainScreen.FormShow(Sender: TObject);
 begin
-  Timer1.Enabled := true;
-  Left := 0;
-  Top := 0;
+  if FullScreen then begin
+    WindowState := wsFullScreen;
+    BorderStyle := bsNone;
+    BorderIcons := [];
+  end else begin
+    WindowState := wsMaximized;
+    BorderStyle := bsSizeable;
+    BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+  end;
+  Timer1.Enabled := True;
 end;
 

branches/highdpi/LocalPlayer/Wonders.lfm

@@ -17 +17 @@
   OnShow = FormShow
   PixelsPerInch = 96
+  Scaled = False
   object CloseBtn: TButtonB
     Left = 442

branches/highdpi/LocalPlayer/Wonders.pas

@@ -87 +87 @@
 procedure TWondersDlg.PaintBackgroundShape;
 const
-  darken = 24;
+  Darken = 24;
   // space=pi/120;
   amax0 = 15734; // 1 shl 16*tan(pi/12-space);
@@ -103 +103 @@
   C: Integer;
   Ch: Integer;
-  Line: array [0..1] of TPixelPointer;
+  Line: array [0..3] of TPixelPointer;
   Width: Integer;
   Height: Integer;
-  CenterNative: TPoint;
-begin
-  Width := ScaleToVcl(180);
-  Height := ScaleToVcl(128);
-  CenterNative := ScalePointtoVcl(Center);
+begin
+  Width := ScaleToNative(180);
+  Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen);
-  Line[1] := PixelPointer(Offscreen);
+  Line[0] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
+  Line[1] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
+  Line[2] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
+  Line[3] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do begin
       r := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
       ax := ((1 shl 16 div (Height div 4)) * (Width div 4)) * Y;
-      if (r < ScaleToVcl(8) * Height * Width * Width) and
+      if (r < ScaleToNative(8) * Height * Width * Width) and
         ((r >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
         ((ax < amax0 * X) or (ax > amin2 * X)) or (ax > amin1 * X) and
-        ((ax < amax1 * X) or (ax > amin3 * X))) then
-        for i := 0 to 1 do
-          for ch := 0 to 2 do begin
-            Line[0].SetXY(CenterNative.X + X, CenterNative.Y + Y);
-            Line[1].SetXY(CenterNative.X + X, CenterNative.Y - 1 - Y);
-            c := Line[i].Pixel^.Planes[ch] - darken;
-            if c < 0 then Line[i].Pixel^.Planes[ch] := 0
-              else Line[i].Pixel^.Planes[ch] := c;
-            Line[0].SetXY(CenterNative.X - 1 - X, CenterNative.Y + Y);
-            Line[1].SetXY(CenterNative.X - 1 - X, CenterNative.Y - 1 - Y);
-            c := Line[i].Pixel^.Planes[ch] - darken;
-            if c < 0 then Line[i].Pixel^.Planes[ch] := 0
-              else Line[i].Pixel^.Planes[ch] := c;
-          end;
-    end;
+        ((ax < amax1 * X) or (ax > amin3 * X))) then begin
+        for ch := 0 to 2 do begin
+          c := Line[0].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[0].Pixel^.Planes[ch] := 0
+            else Line[0].Pixel^.Planes[ch] := c;
+          c := Line[1].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[1].Pixel^.Planes[ch] := 0
+            else Line[1].Pixel^.Planes[ch] := c;
+          c := Line[2].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[2].Pixel^.Planes[ch] := 0
+            else Line[2].Pixel^.Planes[ch] := c;
+          c := Line[3].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[3].Pixel^.Planes[ch] := 0
+            else Line[3].Pixel^.Planes[ch] := c;
+        end;
+      end;
+      Line[0].NextPixel;
+      Line[1].NextPixel;
+      Line[2].PreviousPixel;
+      Line[3].PreviousPixel;
+    end;
+    Line[0].NextLine;
+    Line[1].PreviousLine;
+    Line[2].NextLine;
+    Line[3].PreviousLine;
   end;
   Offscreen.EndUpdate;
@@ -150 +160 @@
   x0Src := (i mod 7) * xSizeBig;
   y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-
-  Src := PixelPointer(BigImp, ScaleToVcl(x0Src), ScaleToVcl(y0Src));
-  Dst := PixelPointer(Offscreen, ScaleToVcl(x0Dst), ScaleToVcl(y0Dst));
-  for Y := 0 to ScaleToVcl(ySizeBig) - 1 do begin
-    for X := 0 to ScaleToVcl(xSizeBig) - 1 do begin
+  Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
+  Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
+  for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
+    for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
       Darken := ((255 - Src.Pixel^.B) * 3 + (255 - Src.Pixel^.G) *
         15 + (255 - Src.Pixel^.R) * 9) div 128;

branches/highdpi/Locale.lfm

@@ -15 +15 @@
   OnShow = FormShow
   LCLVersion = '2.0.2.0'
+  Position = poScreenCenter
+  PixelsPerInch = 96
+  Scaled = False
   object List: TDpiListBox
     Tag = 15360

branches/highdpi/Log.lfm

@@ -18 +18 @@
   OnKeyUp = FormKeyUp
   PixelsPerInch = 96
+  Scaled = False
   object List: TMemo
     Left = 0

branches/highdpi/Messg.lfm

@@ -20 +20 @@
   OnShow = FormShow
   LCLVersion = '1.8.0.6'
+  PixelsPerInch = 96
+  Scaled = False
   object Button1: TButtonA
     Left = 101

branches/highdpi/Packages/CevoComponents/CevoComponents.lpk

@@ -106 +106 @@
       <Item1>
         <PackageName Value="DpiControls"/>
-        <DefaultFilename Value="..\DpiControls\DpiControls.lpk" Prefer="True"/>
       </Item1>
       <Item2>

branches/highdpi/Packages/CevoComponents/Directories.pas

@@ -63 +63 @@
 end;
 
+procedure CopyDir(SourceDir, DestinationDir, Filter: string);
+var
+  Src, Dst: TSearchRec;
+begin
+  if not DirectoryExists(DestinationDir) then CreateDir(DestinationDir);
+  if FindFirst(SourceDir + DirectorySeparator + Filter, $21, Src) = 0 then
+    repeat
+      if (FindFirst(DestinationDir + DirectorySeparator + Src.Name, $21, Dst) <> 0) or
+        (Dst.Time < Src.Time) then
+        CopyFile(SourceDir + DirectorySeparator + Src.Name,
+          DestinationDir + DirectorySeparator + Src.Name, false);
+      FindClose(Dst);
+    until FindNext(Src) <> 0;
+  FindClose(Src);
+end;
+
 procedure UnitInit;
 var
   AppDataDir: string;
-  src, dst: TSearchRec;
 begin
   LocaleCode := '';
@@ -79 +94 @@
     DataDir := AppDataDir;
   end;
-  if not DirectoryExists(GetSavedDir) then CreateDir(GetSavedDir);
-  if not DirectoryExists(GetMapsDir) then CreateDir(GetMapsDir);
 
-  // Copy appdata if not done yet
-  if FindFirst(GetSavedDir(True) + DirectorySeparator + '*.cevo', $21, src) = 0 then
-    repeat
-      if (FindFirst(GetSavedDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
-        (dst.Time < src.Time) then
-        CopyFile(PChar(GetSavedDir(True) + DirectorySeparator + src.Name),
-          PChar(GetSavedDir(True) + DirectorySeparator + src.Name), false);
-      FindClose(dst);
-    until FindNext(src) <> 0;
-  FindClose(src);
-
-  // Copy appdata if not done yet
-  if FindFirst(GetMapsDir(True) + DirectorySeparator + '*.*', $21, src) = 0 then
-    repeat
-      if (FindFirst(GetMapsDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
-        (dst.Time < src.Time) then
-        CopyFile(PChar(GetMapsDir(True) + DirectorySeparator + src.Name),
-          PChar(GetMapsDir(True) + DirectorySeparator + src.Name), false);
-      FindClose(dst);
-    until FindNext(src) <> 0;
-  FindClose(src);
+  CopyDir(GetSavedDir(True), GetSavedDir(False), '*.*');
+  CopyDir(GetMapsDir(True), GetMapsDir(False), '*.*');
 end;
 

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -13 +13 @@
 
   TDrawDlg = class(TDpiForm)
-  public
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-    procedure SmartInvalidate; virtual;
   private
     MoveFormPos: TPoint;
@@ -33 +29 @@
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
     procedure MouseLeave; override;
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure SmartInvalidate; virtual;
   end;
 
@@ -127 +127 @@
   inherited;
   {$IFDEF LINUX}
-  // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
-  NewFormPos := ScreenToClient(DpiMouse.CursorPos);
-  if (NewFormPos.X >= 0) and (NewFormPos.X < Width) and
-    (NewFormPos.Y >= 0) and (NewFormPos.Y < Height) then begin
-    MoveMousePos := ClientToScreen(Point(X, Y));
-    MoveFormPos := Point(Left, Top);
-    MousePosNew := DpiMouse.CursorPos;
-    // Activate move only if mouse position was not changed during inherited call
-    if (MousePosNew.X = MoveMousePos.X) and (MousePosNew.Y = MoveMousePos.Y) then begin
-      MoveActive := True;
-    end;
-  end else MoveActive := False;
+  // Only if client is not doing own mouse move handling
+  if not Assigned(OnMouseDown) or not Assigned(OnMouseMove) or not Assigned(OnMouseUp) then begin
+    // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
+    NewFormPos := ScreenToClient(DpiMouse.CursorPos);
+    if (NewFormPos.X >= 0) and (NewFormPos.X < Width) and
+      (NewFormPos.Y >= 0) and (NewFormPos.Y < Height) then begin
+      MoveMousePos := ClientToScreen(Point(X, Y));
+      MoveFormPos := Point(Left, Top);
+      MousePosNew := DpiMouse.CursorPos;
+      // Activate move only if mouse position was not changed during inherited call
+      if (MousePosNew.X = MoveMousePos.X) and (MousePosNew.Y = MoveMousePos.Y) then begin
+        MoveActive := True;
+      end;
+    end else MoveActive := False;
+  end;
   {$ENDIF}
 end;

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -35 +35 @@
 procedure Sprite(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
-procedure MakeBlue(dst: TDpiBitmap; x, y, Width, Height: Integer);
+procedure MakeBlue(Dst: TDpiBitmap; X, Y, Width, Height: Integer);
+procedure MakeRed(Dst: TDpiBitmap; X, Y, Width, Height: Integer);
 procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
 procedure ImageOp_BCC(dst, Src: TDpiBitmap;
@@ -41 +42 @@
 procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
   Color0, Color2: Integer);
-procedure ImageOp_CCC(bmp: TDpiBitmap; x, y, w, h, Color0, Color1, Color2: Integer);
+procedure ImageOp_CCC(bmp: TDpiBitmap; x, y, Width, Height, Color0, Color1, Color2: Integer);
 function DpiBitCanvas(DestCanvas: TDpiCanvas; X, Y, Width, Height: Integer;
   SrcCanvas: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean; overload;
@@ -57 +58 @@
 procedure FrameImage(ca: TDpiCanvas; Src: TDpiBitmap;
   x, y, Width, Height, xSrc, ySrc: integer; IsControl: boolean = False);
-procedure GlowFrame(dst: TDpiBitmap; x0, y0, Width, Height: integer; cl: TColor);
+procedure GlowFrame(Dst: TDpiBitmap; x0, y0, Width, Height: integer; cl: TColor);
 procedure InitOrnament;
 procedure InitCityMark(const T: TTexture);
@@ -363 +364 @@
   Bitmap.BeginUpdate;
   PixelPtr := PixelPointer(Bitmap);
-  for Y := 0 to ScaleToVcl(Bitmap.Height) - 1 do begin
-    for X := 0 to ScaleToVcl(Bitmap.Width) - 1 do begin
+  for Y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
+    for X := 0 to ScaleToNative(Bitmap.Width) - 1 do begin
       PixelPtr.Pixel^ := ApplyGammaToPixel(PixelPtr.Pixel^);
       PixelPtr.NextPixel;
@@ -381 +382 @@
   SrcPtr := PixelPointer(Src);
   DstPtr := PixelPointer(Dst);
-  for Y := 0 to ScaleToVcl(Src.Height) - 1 do begin
-    for X := 0 to ScaleToVcl(Src.Width) - 1 do begin
+  for Y := 0 to ScaleToNative(Src.Height - 1) do begin
+    for X := 0 to ScaleToNative(Src.Width - 1) do begin
       DstPtr.Pixel^.B := SrcPtr.Pixel^.B;
       DstPtr.Pixel^.G := SrcPtr.Pixel^.B;
@@ -403 +404 @@
     Path := Path + '.png';
   if ExtractFileExt(Path) = '.jpg' then begin
-    jtex := tDpijpegimage.Create;
+    jtex := TDpiJpegImage.Create;
     try
       jtex.LoadFromFile(Path);
@@ -505 +506 @@
     DataPixel := PixelPointer(GrExt[nGrExt].Data);
     MaskPixel := PixelPointer(GrExt[nGrExt].Mask);
-    for y := 0 to ScaleToVcl(Source.Height) - 1 do begin
-      for x := 0 to ScaleToVcl(xmax) - 1 do begin
+    for y := 0 to ScaleToNative(Source.Height) - 1 do begin
+      for x := 0 to ScaleToNative(xmax) - 1 do begin
         OriginalColor := DataPixel.Pixel^.ARGB and $FFFFFF;
         if (OriginalColor = $FF00FF) or (OriginalColor = $7F007F) then
@@ -538 +539 @@
 end;
 
-procedure MakeBlue(dst: TDpiBitmap; x, y, Width, Height: Integer);
-var
-  XX, YY: integer;
+procedure MakeBlue(Dst: TDpiBitmap; X, Y, Width, Height: Integer);
+var
+  XX, YY: Integer;
   PixelPtr: TPixelPointer;
 begin
-  X := ScaleToVcl(X);
-  Y := ScaleToVcl(Y);
-  Width := ScaleToVcl(Width);
-  Height := ScaleToVcl(Height);
   Dst.BeginUpdate;
-  PixelPtr := PixelPointer(Dst, X, Y);
-  for yy := 0 to Height - 1 do begin
-    for xx := 0 to Width - 1 do begin
+  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  for yy := 0 to ScaleToNative(Height) - 1 do begin
+    for xx := 0 to ScaleToNative(Width) - 1 do begin
       PixelPtr.Pixel^.B := PixelPtr.Pixel^.B div 2;
       PixelPtr.Pixel^.G := PixelPtr.Pixel^.G div 2;
@@ -561 +558 @@
 end;
 
+procedure MakeRed(Dst: TDpiBitmap; X, Y, Width, Height: Integer);
+var
+  XX, YY: Integer;
+  Gray: Integer;
+  PixelPtr: TPixelPointer;
+begin
+  Dst.BeginUpdate;
+  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  for YY := 0 to ScaleToNative(Height) - 1 do begin
+    for XX := 0 to ScaleToNative(Width) - 1 do begin
+      Gray := (Integer(PixelPtr.Pixel^.B) + Integer(PixelPtr.Pixel^.G) +
+        Integer(PixelPtr.Pixel^.R)) * 85 shr 8;
+      PixelPtr.Pixel^.B := 0;
+      PixelPtr.Pixel^.G := 0;
+      PixelPtr.Pixel^.R := Gray; // 255-(255-gray) div 2;
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
+  Dst.EndUpdate;
+end;
+
 procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
 // Src is template
@@ -570 +589 @@
   PixelDst: TPixelPointer;
 begin
-  xDst := ScaleToVcl(xDst);
-  yDst := ScaleToVcl(yDst);
-  xSrc := ScaleToVcl(xSrc);
-  ySrc := ScaleToVcl(ySrc);
-  Width := ScaleToVcl(Width);
-  Height := ScaleToVcl(Height);
+  xDst := ScaleToNative(xDst);
+  yDst := ScaleToNative(yDst);
+  xSrc := ScaleToNative(xSrc);
+  ySrc := ScaleToNative(ySrc);
+  Width := ScaleToNative(Width);
+  Height := ScaleToNative(Height);
   //Assert(Src.PixelFormat = pf8bit);
   Assert(dst.PixelFormat = pf24bit);
@@ -588 +607 @@
     yDst := 0;
   end;
-  if xDst + Width > ScaleToVcl(dst.Width) then
-    Width := ScaleToVcl(dst.Width) - xDst;
-  if yDst + Height > ScaleToVcl(dst.Height) then
-    Height := ScaleToVcl(dst.Height) - yDst;
+  if xDst + Width > ScaleToNative(dst.Width) then
+    Width := ScaleToNative(dst.Width) - xDst;
+  if yDst + Height > ScaleToNative(dst.Height) then
+    Height := ScaleToNative(dst.Height) - yDst;
   if (Width < 0) or (Height < 0) then
     exit;
@@ -638 +657 @@
   DstPixel: TPixelPointer;
 begin
-  xDst := ScaleToVcl(xDst);
-  yDst := ScaleToVcl(yDst);
-  xSrc := ScaleToVcl(xSrc);
-  ySrc := ScaleToVcl(ySrc);
-  Width := ScaleToVcl(Width);
-  Height := ScaleToVcl(Height);
+  xDst := ScaleToNative(xDst);
+  yDst := ScaleToNative(yDst);
+  xSrc := ScaleToNative(xSrc);
+  ySrc := ScaleToNative(ySrc);
+  Width := ScaleToNative(Width);
+  Height := ScaleToNative(Height);
   if xDst < 0 then begin
     Width := Width + xDst;
@@ -654 +673 @@
     yDst := 0;
   end;
-  if xDst + Width > ScaleToVcl(dst.Width) then
-    Width := ScaleToVcl(dst.Width) - xDst;
-  if yDst + Height > ScaleToVcl(dst.Height) then
-    Height := ScaleToVcl(dst.Height) - yDst;
+  if xDst + Width > ScaleToNative(dst.Width) then
+    Width := ScaleToNative(dst.Width) - xDst;
+  if yDst + Height > ScaleToNative(dst.Height) then
+    Height := ScaleToNative(dst.Height) - yDst;
   if (Width < 0) or (Height < 0) then
     exit;
@@ -705 +724 @@
   DstPixel: TPixelPointer;
 begin
-  xDst := ScaleToVcl(xDst);
-  yDst := ScaleToVcl(yDst);
-  xSrc := ScaleToVcl(xSrc);
-  ySrc := ScaleToVcl(ySrc);
-  Width := ScaleToVcl(Width);
-  Height := ScaleToVcl(Height);
+  xDst := ScaleToNative(xDst);
+  yDst := ScaleToNative(yDst);
+  xSrc := ScaleToNative(xSrc);
+  ySrc := ScaleToNative(ySrc);
+  Width := ScaleToNative(Width);
+  Height := ScaleToNative(Height);
   Src.BeginUpdate;
   Dst.BeginUpdate;
@@ -743 +762 @@
 end;
 
-procedure ImageOp_CCC(bmp: TDpiBitmap; x, y, w, h, Color0, Color1, Color2: Integer);
+procedure ImageOp_CCC(bmp: TDpiBitmap; x, y, Width, Height, Color0, Color1, Color2: Integer);
 // Bmp is template
 // B channel = Color0 amp, 128=original brightness
@@ -752 +771 @@
   PixelPtr: TPixelPointer;
 begin
-  X := ScaleToVcl(X);
-  Y := ScaleToVcl(Y);
-  W := ScaleToVcl(W);
-  H := ScaleToVcl(H);
+  X := ScaleToNative(X);
+  Y := ScaleToNative(Y);
+  Width := ScaleToNative(Width);
+  Height := ScaleToNative(Height);
   bmp.BeginUpdate;
   assert(bmp.PixelFormat = pf24bit);
-  h := y + h;
+  Height := y + Height;
   PixelPtr := PixelPointer(Bmp, x, y);
-  while y < h do begin
-    for i := 0 to w - 1 do begin
+  while y < Height do begin
+    for i := 0 to Width - 1 do begin
       Red := ((PixelPtr.Pixel^.B * (Color0 and $0000FF) + PixelPtr.Pixel^.G *
         (Color1 and $0000FF) + PixelPtr.Pixel^.R * (Color2 and $0000FF)) shr 8) and $ff;
@@ -799 +818 @@
   SrcCanvas: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 begin
+  {$IFDEF WINDOWS}
+  // LCLIntf.BitBlt is slower than direct Windows BitBlt
+  Result := Windows.DpiBitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
+  {$ELSE}
   Result := DpiBitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
+  {$ENDIF}
 end;
 
@@ -903 +927 @@
 end;
 
-procedure GlowFrame(dst: TDpiBitmap; x0, y0, Width, Height: Integer; cl: TColor);
+procedure GlowFrame(Dst: TDpiBitmap; x0, y0, Width, Height: Integer; cl: TColor);
 var
   x, y, ch, r: Integer;
@@ -909 +933 @@
   DpiGlowRange: Integer;
 begin
-  DpiGlowRange := ScaleToVcl(GlowRange);
-  X0 := ScaleToVcl(X0);
-  Y0 := ScaleToVcl(Y0);
-  Width := ScaleToVcl(Width);
-  Height := ScaleToVcl(Height);
-  dst.BeginUpdate;
-  DstPtr := PixelPointer(dst, x0, y0);
+  DpiGlowRange := ScaleToNative(GlowRange);
+  X0 := ScaleToNative(X0);
+  Y0 := ScaleToNative(Y0);
+  Width := ScaleToNative(Width);
+  Height := ScaleToNative(Height);
+  Dst.BeginUpdate;
+  DstPtr := PixelPointer(Dst, x0 - DpiGlowRange + 1, y0 - DpiGlowRange + 1);
   for y := -DpiGlowRange + 1 to Height - 1 + DpiGlowRange - 1 do begin
     for x := -DpiGlowRange + 1 to Width - 1 + DpiGlowRange - 1 do begin
-      DstPtr.SetXY(x, y);
       if x < 0 then
         if y < 0 then
@@ -937 +960 @@
       else if y >= Height then
         r := y - (Height - 1)
-      else
+      else begin
+        DstPtr.NextPixel;
         continue;
+      end;
       if r = 0 then
         r := 1;
@@ -946 +971 @@
             (DstPtr.Pixel^.Planes[2 - ch] * (r - 1) + (cl shr (8 * ch) and $FF) *
             (DpiGlowRange - r)) div (DpiGlowRange - 1);
-    end;
-  end;
-  dst.EndUpdate;
+      DstPtr.NextPixel;
+    end;
+    DstPtr.NextLine;
+  end;
+  Dst.EndUpdate;
 end;
 
@@ -1509 +1536 @@
   // texturize background
   Dest.BeginUpdate;
-  TexWidth := ScaleToVcl(Texture.Width);
-  TexHeight := ScaleToVcl(Texture.Height);
+  TexWidth := Texture.Width;
+  TexHeight := Texture.Height;
   DstPixel := PixelPointer(Dest);
   SrcPixel := PixelPointer(Texture);
-  for Y := 0 to ScaleToVcl(Dest.Height) - 1 do begin
-    for X := 0 to ScaleToVcl(Dest.Width) - 1 do begin
+  for Y := 0 to ScaleToNative(Dest.Height) - 1 do begin
+    for X := 0 to ScaleToNative(Dest.Width) - 1 do begin
       if (DstPixel.Pixel^.ARGB and $FFFFFF) = TransparentColor then begin
         SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
@@ -1535 +1562 @@
   Bitmap.BeginUpdate;
   PicturePixel := PixelPointer(Bitmap);
-  for y := 0 to ScaleToVcl(Bitmap.Height) - 1 do begin
-    for x := 0 to ScaleToVcl(Bitmap.Width) - 1 do begin
+  for y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
+    for x := 0 to ScaleToNative(Bitmap.Width) - 1 do begin
       PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - Change, 0);
       PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - Change, 0);
@@ -1545 +1572 @@
   end;
   Bitmap.EndUpdate;
+end;
+
+function ScaleToNative(Value: Integer): Integer;
+begin
+  Result := Value;
+end;
+
+function ScaleFromNative(Value: Integer): Integer;
+begin
+  Result := Value;
 end;
 

branches/highdpi/Packages/CevoComponents/UPixelPointer.pas

@@ -27 +27 @@
     BytesPerPixel: Integer;
     BytesPerLine: Integer;
-    procedure NextLine; inline; // Move pointer to start of new base line
+    procedure NextLine; inline; // Move pointer to start of next line
+    procedure PreviousLine; inline; // Move pointer to start of previous line
     procedure NextPixel; inline; // Move pointer to next pixel
+    procedure PreviousPixel; inline; // Move pointer to previous pixel
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
@@ -47 +49 @@
 end;
 
+procedure TPixelPointer.PreviousLine;
+begin
+  Line := Pointer(Line) - BytesPerLine;
+  Pixel := Line;
+end;
+
 procedure TPixelPointer.NextPixel; inline;
 begin
   Pixel := Pointer(Pixel) + BytesPerPixel;
+end;
+
+procedure TPixelPointer.PreviousPixel;
+begin
+  Pixel := Pointer(Pixel) - BytesPerPixel;
 end;
 

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -77 +77 @@
   protected
     procedure ScreenChanged;
-    function GetVclFont: TFont; virtual;
+    function GetNativeFont: TFont; virtual;
   public
-    VclFont: TFont;
+    NativeFont: TFont;
     constructor Create;
     destructor Destroy; override;
@@ -162 +162 @@
     procedure SetOnResize(AValue: TNotifyEvent);
     procedure SetShowHint(AValue: Boolean);
-    procedure VclFormResize(Sender: TObject);
-    procedure VclChangeBounds(Sender: TObject);
+    procedure NativeFormResize(Sender: TObject);
+    procedure NativeChangeBounds(Sender: TObject);
     procedure DoFormResize;
     procedure DoChangeBounds;
@@ -186 +186 @@
     procedure SetVisible(AValue: Boolean); virtual;
     procedure SetWidth(AValue: Integer); virtual;
-    function GetVclControl: TControl; virtual;
-    procedure UpdateVclControl; virtual;
+    function GetNativeControl: TControl; virtual;
+    procedure UpdateNativeControl; virtual;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
       X, Y: Integer); virtual;
@@ -247 +247 @@
   protected
     FDpi: Integer;
-    function GetVclGraphic: TGraphic; virtual;
+    function GetNativeGraphic: TGraphic; virtual;
     function GetWidth: Integer; virtual; abstract;
     function GetHeight: Integer; virtual; abstract;
@@ -256 +256 @@
     function GetDpi: Integer; virtual;
   public
-    VclGraphicClass: TGraphicClass;
+    NativeGraphicClass: TGraphicClass;
     constructor Create; virtual;
     procedure LoadFromFile(const Filename: string); virtual;
@@ -271 +271 @@
     function GetRawImage: TRawImage;
   protected
-    function GetVclGraphic: TGraphic; override;
-    function GetVclRasterImage: TRasterImage; virtual;
+    function GetNativeGraphic: TGraphic; override;
+    function GetNativeRasterImage: TRasterImage; virtual;
   public
     property RawImage: TRawImage read GetRawImage;
@@ -282 +282 @@
   private
     FFont: TDpiFont;
-    FVclCanvas: TCanvas;
+    FNativeCanvas: TCanvas;
     function GetBrush: TBrush;
     function GetHandle: HDC;
@@ -294 +294 @@
     procedure SetPen(AValue: TPen);
     procedure SetPixel(X, Y: Integer; AValue: TColor);
-    procedure SetVclCanvas(AValue: TCanvas);
+    procedure SetNativeCanvas(AValue: TCanvas);
   protected
-    function GetVclCanvas: TCanvas; virtual;
+    function GetNativeCanvas: TCanvas; virtual;
   public
-    property VclCanvas: TCanvas read FVclCanvas write SetVclCanvas;
+    property NativeCanvas: TCanvas read FNativeCanvas write SetNativeCanvas;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic); virtual;
     procedure FrameRect(Rect: TRect);
@@ -331 +331 @@
   private
     FOnPaint: TNotifyEvent;
-    VclGraphicControl: TGraphicControl;
+    NativeGraphicControl: TGraphicControl;
     FCanvas: TDpiCanvas;
     function GetOnPaint: TNotifyEvent;
@@ -339 +339 @@
   protected
     procedure Paint; virtual;
-    function GetVclControl: TControl; override;
-    function GetVclGraphicControl: TGraphicControl; virtual;
-    procedure UpdateVclControl; override;
+    function GetNativeControl: TControl; override;
+    function GetNativeGraphicControl: TGraphicControl; virtual;
+    procedure UpdateNativeControl; override;
     property OnPaint: TNotifyEvent read GetOnPaint write SetOnPaint;
   public
@@ -367 +367 @@
     procedure SetTabStop(AValue: Boolean);
   protected
-    function GetVclControl: TControl; override;
-    function GetVclWinControl: TWinControl; virtual;
+    function GetNativeControl: TControl; override;
+    function GetNativeWinControl: TWinControl; virtual;
   public
     Controls: TDpiControls;
@@ -395 +395 @@
     procedure SetPixelsPerInch(AValue: Integer);
   protected
-    function GetVclWinControl: TWinControl; override;
-    function GetVclCustomControl: TCustomControl; virtual;
+    function GetNativeWinControl: TWinControl; override;
+    function GetNativeCustomControl: TCustomControl; virtual;
   public
     property Canvas: TDpiCanvas read GetCanvas;
@@ -421 +421 @@
     FVertScrollBar: TDpiControlScrollBar;
   protected
-    function GetVclCustomControl: TCustomControl; override;
-    function GetVclScrollingWinControl: TScrollingWinControl; virtual;
+    function GetNativeCustomControl: TCustomControl; override;
+    function GetNativeScrollingWinControl: TScrollingWinControl; virtual;
   public
     constructor Create(TheOwner: TComponent); override;
@@ -480 +480 @@
     procedure CreateParams(var p: TCreateParams); virtual;
     procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override;
-    function GetVclScrollingWinControl: TScrollingWinControl; override;
-    function GetVclForm: TForm; virtual;
-    procedure UpdateVclControl; override;
+    function GetNativeScrollingWinControl: TScrollingWinControl; override;
+    function GetNativeForm: TForm; virtual;
+    procedure UpdateNativeControl; override;
   public
-    VclForm: TForm;
+    NativeForm: TForm;
     procedure AfterConstruction; override;
     property ModalResult: TModalResult read GetModalResult write SetModalResult;
@@ -527 +527 @@
   private
   protected
-    function GetVclControl: TControl; override;
+    function GetNativeControl: TControl; override;
   public
-    VclButton: TButton;
+    NativeButton: TButton;
     destructor Destroy; override;
   published
@@ -559 +559 @@
     procedure SetTopIndex(AValue: Integer);
   protected
-    function GetVclWinControl: TWinControl; override;
-    function GetVclListBox: TListBox; virtual;
+    function GetNativeWinControl: TWinControl; override;
+    function GetNativeListBox: TListBox; virtual;
   public
-    VclListBox: TListBox;
+    NativeListBox: TListBox;
     destructor Destroy; override;
     property ItemIndex: Integer read GetItemIndex write SetItemIndex;
@@ -598 +598 @@
     procedure SetPosition(AValue: Integer);
   protected
-    function GetVclControl: TControl; override;
+    function GetNativeControl: TControl; override;
   public
-    VclScrollBar: TScrollBar;
+    NativeScrollBar: TScrollBar;
     destructor Destroy; override;
   published
@@ -627 +627 @@
     function GetHeight: Integer; override;
     function GetWidth: Integer; override;
-    function GetVclBitmap: TCustomBitmap; virtual;
-    function GetVclRasterImage: TRasterImage; override;
+    function GetNativeBitmap: TCustomBitmap; virtual;
+    function GetNativeRasterImage: TRasterImage; override;
     procedure SetHeight(AValue: Integer); override;
     procedure SetWidth(AValue: Integer); override;
     procedure ScreenChanged; override;
   public
-    VclBitmap: TBitmap;
+    NativeBitmap: TBitmap;
     procedure BeginUpdate;
     procedure EndUpdate;
@@ -669 +669 @@
   protected
   public
-    VclImage: TImage;
-    function GetVclControl: TControl; override;
+    NativeImage: TImage;
+    function GetNativeControl: TControl; override;
     destructor Destroy; override;
   published
@@ -682 +682 @@
   TDpiPaintBox = class(TDpiGraphicControl)
   public
-    VclPaintBox: TPaintBox;
-    function GetVclGraphicControl: TGraphicControl; override;
+    NativePaintBox: TPaintBox;
+    function GetNativeGraphicControl: TGraphicControl; override;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -718 +718 @@
     destructor Destroy; override;
     procedure UpdateScreen;
-    procedure UpdateActiveFormFromVclScreen;
+    procedure UpdateActiveFormFromNativeScreen;
     property FormCount: Integer read GetFormCount;
     property Forms[Index: Integer]: TDpiForm read GetForms;
@@ -735 +735 @@
   TDpiJpegImage = class(TDpiBitmap)
   protected
-    function GetVclBitmap: TCustomBitmap; override;
-    function GetVclJpeg: TJPEGImage; virtual;
+    function GetNativeBitmap: TCustomBitmap; override;
+    function GetNativeJpeg: TJPEGImage; virtual;
   public
-    VclJpeg: TJPEGImage;
+    NativeJpeg: TJPEGImage;
     constructor Create; override;
   end;
@@ -746 +746 @@
   TDpiPortableNetworkGraphic = class(TDpiBitmap)
   protected
-    function GetVclBitmap: TCustomBitmap; override;
-    function GetVclPng: TPortableNetworkGraphic; virtual;
+    function GetNativeBitmap: TCustomBitmap; override;
+    function GetNativePng: TPortableNetworkGraphic; virtual;
   public
-    VclPng: TPortableNetworkGraphic;
+    NativePng: TPortableNetworkGraphic;
     constructor Create; override;
   end;
@@ -767 +767 @@
     procedure SetTitle(AValue: string);
   protected
-    function GetVclApplication: TApplication; virtual;
+    function GetNativeApplication: TApplication; virtual;
   public
     constructor Create(AOwner: TComponent); override;
@@ -828 +828 @@
     procedure OnClickHandler(Sender: TObject);
   protected
-    function GetVclMenuItem: TMenuItem; virtual;
+    function GetNativeMenuItem: TMenuItem; virtual;
     procedure SetParentComponent(AValue: TComponent); override;
   public
-    VclMenuItem: TMenuItem;
+    NativeMenuItem: TMenuItem;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -861 +861 @@
     FItems: TDpiMenuItem;
   protected
-    function GetVclMenu: TMenu; virtual;
+    function GetNativeMenu: TMenu; virtual;
   public
     property Items: TDpiMenuItem read FItems;
@@ -875 +875 @@
     procedure SetAutoPopup(AValue: Boolean);
   protected
-    function GetVclMenu: TMenu; override;
-    function GetVclPopupMenu: TPopupMenu; virtual;
+    function GetNativeMenu: TMenu; override;
+    function GetNativePopupMenu: TPopupMenu; virtual;
   public
-    VclPopupMenu: TPopupMenu;
+    NativePopupMenu: TPopupMenu;
     procedure PopUp;
     procedure PopUp(X, Y: Integer); virtual;
@@ -897 +897 @@
 function DpiBitBltCanvas(Dest: TDpiCanvas; X, Y, Width, Height: Integer; Src: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 function DpiCreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
-function ScaleToVcl(Value: Integer): Integer;
-function ScaleFromVcl(Value: Integer): Integer;
-function ScalePointToVcl(Value: TPoint): TPoint;
-function ScalePointFromVcl(Value: TPoint): TPoint;
-function ScaleSizeToVcl(Value: TSize): TSize;
-function ScaleSizeFromVcl(Value: TSize): TSize;
-function ScaleRectToVcl(Value: TRect): TRect;
-function ScaleRectFromVcl(Value: TRect): TRect;
+function ScaleToNative(Value: Integer): Integer;
+function ScaleFromNative(Value: Integer): Integer;
+function ScalePointToNative(Value: TPoint): TPoint;
+function ScalePointFromNative(Value: TPoint): TPoint;
+function ScaleSizeToNative(Value: TSize): TSize;
+function ScaleSizeFromNative(Value: TSize): TSize;
+function ScaleRectToNative(Value: TRect): TRect;
+function ScaleRectFromNative(Value: TRect): TRect;
 
 
@@ -933 +933 @@
 function DpiCreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
 begin
-  Result := CreateRectRgn(ScaleToVcl(X1), ScaleToVcl(Y1), ScaleToVcl(X2),
-    ScaleToVcl(Y2));
-end;
-
-function ScaleToVcl(Value: Integer): Integer;
+  Result := CreateRectRgn(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2),
+    ScaleToNative(Y2));
+end;
+
+function ScaleToNative(Value: Integer): Integer;
 begin
   Result := Round(Value * DpiScreen.Dpi / 96);
 end;
 
-function ScaleFromVcl(Value: Integer): Integer;
+function ScaleFromNative(Value: Integer): Integer;
 begin
   Result := Round(Value * 96 / DpiScreen.Dpi);
 end;
 
-function ScalePointToVcl(Value: TPoint): TPoint;
-begin
-  Result.X := ScaleToVcl(Value.X);
-  Result.Y := ScaleToVcl(Value.Y);
-end;
-
-function ScalePointFromVcl(Value: TPoint): TPoint;
-begin
-  Result.X := ScaleFromVcl(Value.X);
-  Result.Y := ScaleFromVcl(Value.Y);
-end;
-
-function ScaleSizeToVcl(Value: TSize): TSize;
-begin
-  Result.Width := ScaleToVcl(Value.Width);
-  Result.Height := ScaleToVcl(Value.Height);
-end;
-
-function ScaleSizeFromVcl(Value: TSize): TSize;
-begin
-  Result.Width := ScaleFromVcl(Value.Width);
-  Result.Height := ScaleFromVcl(Value.Height);
-end;
-
-function ScaleRectToVcl(Value: TRect): TRect;
-begin
-  Result.Left := ScaleToVcl(Value.Left);
-  Result.Top := ScaleToVcl(Value.Top);
-  Result.Right := ScaleToVcl(Value.Right);
-  Result.Bottom := ScaleToVcl(Value.Bottom);
-end;
-
-function ScaleRectFromVcl(Value: TRect): TRect;
-begin
-  Result.Left := ScaleFromVcl(Value.Left);
-  Result.Top := ScaleFromVcl(Value.Top);
-  Result.Right := ScaleFromVcl(Value.Right);
-  Result.Bottom := ScaleFromVcl(Value.Bottom);
+function ScalePointToNative(Value: TPoint): TPoint;
+begin
+  Result.X := ScaleToNative(Value.X);
+  Result.Y := ScaleToNative(Value.Y);
+end;
+
+function ScalePointFromNative(Value: TPoint): TPoint;
+begin
+  Result.X := ScaleFromNative(Value.X);
+  Result.Y := ScaleFromNative(Value.Y);
+end;
+
+function ScaleSizeToNative(Value: TSize): TSize;
+begin
+  Result.Width := ScaleToNative(Value.Width);
+  Result.Height := ScaleToNative(Value.Height);
+end;
+
+function ScaleSizeFromNative(Value: TSize): TSize;
+begin
+  Result.Width := ScaleFromNative(Value.Width);
+  Result.Height := ScaleFromNative(Value.Height);
+end;
+
+function ScaleRectToNative(Value: TRect): TRect;
+begin
+  Result.Left := ScaleToNative(Value.Left);
+  Result.Top := ScaleToNative(Value.Top);
+  Result.Right := ScaleToNative(Value.Right);
+  Result.Bottom := ScaleToNative(Value.Bottom);
+end;
+
+function ScaleRectFromNative(Value: TRect): TRect;
+begin
+  Result.Left := ScaleFromNative(Value.Left);
+  Result.Top := ScaleFromNative(Value.Top);
+  Result.Right := ScaleFromNative(Value.Right);
+  Result.Bottom := ScaleFromNative(Value.Bottom);
 end;
 
@@ -990 +990 @@
   YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 begin
-  Result := BitBlt(DestDC, ScaleToVcl(X), ScaleToVcl(Y), ScaleToVcl(Width),
-    ScaleToVcl(Height), SrcDC, ScaleToVcl(XSrc), ScaleToVcl(YSrc), Rop);
+  Result := BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y), ScaleToNative(Width),
+    ScaleToNative(Height), SrcDC, ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
 end;
 
 { TDpiMenu }
 
-function TDpiMenu.GetVclMenu: TMenu;
+function TDpiMenu.GetNativeMenu: TMenu;
 begin
   Result := nil;
@@ -1017 +1017 @@
 function TDpiMenuItem.GetCaption: TTranslateString;
 begin
-  Result := GetVclMenuItem.Caption;
+  Result := GetNativeMenuItem.Caption;
 end;
 
 function TDpiMenuItem.GetChecked: Boolean;
 begin
-  Result := GetVclMenuItem.Checked;
+  Result := GetNativeMenuItem.Checked;
 end;
 
@@ -1032 +1032 @@
 function TDpiMenuItem.GetEnabled: Boolean;
 begin
-  Result := GetVclMenuItem.Enabled;
+  Result := GetNativeMenuItem.Enabled;
 end;
 
 function TDpiMenuItem.GetGroupIndex: Byte;
 begin
-  Result := GetVclMenuItem.GroupIndex;
+  Result := GetNativeMenuItem.GroupIndex;
 end;
 
@@ -1052 +1052 @@
 function TDpiMenuItem.GetRadioItem: Boolean;
 begin
-  Result := GetVclMenuItem.RadioItem;
+  Result := GetNativeMenuItem.RadioItem;
 end;
 
 function TDpiMenuItem.GetShortCut: TShortCut;
 begin
-  Result := GetVclMenuItem.ShortCut;
+  Result := GetNativeMenuItem.ShortCut;
 end;
 
 function TDpiMenuItem.GetVisible: Boolean;
 begin
-  Result := GetVclMenuItem.Visible;
+  Result := GetNativeMenuItem.Visible;
 end;
 
@@ -1092 +1092 @@
 procedure TDpiMenuItem.SetCaption(AValue: TTranslateString);
 begin
-  GetVclMenuItem.Caption := AValue;
+  GetNativeMenuItem.Caption := AValue;
 end;
 
 procedure TDpiMenuItem.SetChecked(AValue: Boolean);
 begin
-  GetVclMenuItem.Checked := AValue;
+  GetNativeMenuItem.Checked := AValue;
 end;
 
 procedure TDpiMenuItem.SetEnabled(AValue: Boolean);
 begin
-  GetVclMenuItem.Enabled := AValue;
+  GetNativeMenuItem.Enabled := AValue;
 end;
 
 procedure TDpiMenuItem.SetGroupIndex(AValue: Byte);
 begin
-  GetVclMenuItem.GroupIndex := AValue;
+  GetNativeMenuItem.GroupIndex := AValue;
 end;
 
@@ -1117 +1117 @@
 procedure TDpiMenuItem.SetRadioItem(AValue: Boolean);
 begin
-  GetVclMenuItem.RadioItem := AValue;
+  GetNativeMenuItem.RadioItem := AValue;
 end;
 
 procedure TDpiMenuItem.SetShortCut(AValue: TShortCut);
 begin
-  GetVclMenuItem.ShortCut := AValue;
+  GetNativeMenuItem.ShortCut := AValue;
 end;
 
 procedure TDpiMenuItem.SetVisible(AValue: Boolean);
 begin
-  GetVclMenuItem.Visible := AValue;
+  GetNativeMenuItem.Visible := AValue;
 end;
 
@@ -1139 +1139 @@
 begin
   FItems.Delete(Index);
-  GetVclMenuItem.Delete(Index);
+  GetNativeMenuItem.Delete(Index);
 end;
 
@@ -1150 +1150 @@
 begin
   FItems.Insert(Index, Item);
-  GetVclMenuItem.Insert(Index, Item.GetVclMenuItem);
+  GetNativeMenuItem.Insert(Index, Item.GetNativeMenuItem);
 end;
 
@@ -1171 +1171 @@
 end;
 
-function TDpiMenuItem.GetVclMenuItem: TMenuItem;
-begin
-  if not Assigned(VclMenuItem) then begin
-    VclMenuItem := TMenuItem.Create(nil);
-    VclMenuItem.Name := 'Vcl' + Name;
-    VclMenuItem.OnClick := @OnClickHandler;
-  end;
-  Result := VclMenuItem;
+function TDpiMenuItem.GetNativeMenuItem: TMenuItem;
+begin
+  if not Assigned(NativeMenuItem) then begin
+    NativeMenuItem := TMenuItem.Create(nil);
+    NativeMenuItem.Name := 'Native' + Name;
+    NativeMenuItem.OnClick := @OnClickHandler;
+  end;
+  Result := NativeMenuItem;
 end;
 
@@ -1220 +1220 @@
 procedure TDpiPopupMenu.PopUp(X, Y: Integer);
 begin
-  GetVclPopupMenu.PopUp(ScaleToVcl(X), ScaleToVcl(Y));
+  GetNativePopupMenu.PopUp(ScaleToNative(X), ScaleToNative(Y));
 end;
 
@@ -1226 +1226 @@
 begin
   inherited;
-  GetVclPopupMenu;
+  GetNativePopupMenu;
 end;
 
 function TDpiPopupMenu.GetAutoPopup: Boolean;
 begin
-  Result := GetVclPopupMenu.AutoPopup;
+  Result := GetNativePopupMenu.AutoPopup;
 end;
 
 procedure TDpiPopupMenu.SetAutoPopup(AValue: Boolean);
 begin
-  GetVclPopupMenu.AutoPopup := AValue;
-end;
-
-function TDpiPopupMenu.GetVclMenu: TMenu;
-begin
-  Result := GetVclPopupMenu;
-end;
-
-function TDpiPopupMenu.GetVclPopupMenu: TPopupMenu;
-begin
-  if not Assigned(VclPopupMenu) then begin
-    VclPopupMenu := TPopupMenu.Create(nil);
-    if Assigned(Items.VclMenuItem) then Items.VclMenuItem.Free;
-    Items.VclMenuItem := VclPopupMenu.Items;
-  end;
-  Result := VclPopupMenu;
+  GetNativePopupMenu.AutoPopup := AValue;
+end;
+
+function TDpiPopupMenu.GetNativeMenu: TMenu;
+begin
+  Result := GetNativePopupMenu;
+end;
+
+function TDpiPopupMenu.GetNativePopupMenu: TPopupMenu;
+begin
+  if not Assigned(NativePopupMenu) then begin
+    NativePopupMenu := TPopupMenu.Create(nil);
+    if Assigned(Items.NativeMenuItem) then Items.NativeMenuItem.Free;
+    Items.NativeMenuItem := NativePopupMenu.Items;
+  end;
+  Result := NativePopupMenu;
 end;
 
 destructor TDpiPopupMenu.Destroy;
 begin
-  if Assigned(VclPopupMenu) then FreeAndNil(VclPopupMenu);
+  if Assigned(NativePopupMenu) then FreeAndNil(NativePopupMenu);
   inherited Destroy;
 end;
@@ -1264 +1264 @@
 function TDpiMouse.GetCursorPos: TPoint;
 begin
-  Result := ScalePointFromVcl(Mouse.CursorPos);
+  Result := ScalePointFromNative(Mouse.CursorPos);
 end;
 
 procedure TDpiMouse.SetCursorPos(AValue: TPoint);
 begin
-  Mouse.CursorPos := ScalePointToVcl(AValue);
+  Mouse.CursorPos := ScalePointToNative(AValue);
 end;
 
@@ -1305 +1305 @@
 { TDpiScrollingWinControl }
 
-function TDpiScrollingWinControl.GetVclCustomControl: TCustomControl;
-begin
-  Result := GetVclScrollingWinControl;
-end;
-
-function TDpiScrollingWinControl.GetVclScrollingWinControl: TScrollingWinControl;
+function TDpiScrollingWinControl.GetNativeCustomControl: TCustomControl;
+begin
+  Result := GetNativeScrollingWinControl;
+end;
+
+function TDpiScrollingWinControl.GetNativeScrollingWinControl: TScrollingWinControl;
 begin
   Result := nil;
@@ -1366 +1366 @@
 function TDpiApplication.GetTitle: string;
 begin
-  Result := GetVclApplication.Title;
+  Result := GetNativeApplication.Title;
 end;
 
 function TDpiApplication.GetShowMainForm: Boolean;
 begin
-  Result := GetVclApplication.ShowMainForm;
+  Result := GetNativeApplication.ShowMainForm;
 end;
 
@@ -1386 +1386 @@
 procedure TDpiApplication.SetShowMainForm(AValue: Boolean);
 begin
-  GetVclApplication.ShowMainForm := AValue;
+  GetNativeApplication.ShowMainForm := AValue;
 end;
 
 procedure TDpiApplication.SetTitle(AValue: string);
 begin
-  GetVclApplication.Title := AValue;
-end;
-
-function TDpiApplication.GetVclApplication: TApplication;
+  GetNativeApplication.Title := AValue;
+end;
+
+function TDpiApplication.GetNativeApplication: TApplication;
 begin
   Result := Application;
@@ -1419 +1419 @@
 begin
   if (FMainForm <> nil) and GetShowMainForm then FMainForm.Show;
-  GetVclApplication.Run;
+  GetNativeApplication.Run;
 end;
 
 procedure TDpiApplication.Initialize;
 begin
-  GetVclApplication.Initialize;
+  GetNativeApplication.Initialize;
   DpiScreen.UpdateScreen;
 end;
@@ -1435 +1435 @@
 procedure TDpiApplication.ProcessMessages;
 begin
-  GetVclApplication.ProcessMessages;
+  GetNativeApplication.ProcessMessages;
 end;
 
@@ -1446 +1446 @@
   then
     FMainForm := AForm;
-  GetVclApplication.UpdateMainForm(AForm.GetVclForm);
+  GetNativeApplication.UpdateMainForm(AForm.GetNativeForm);
 end;
 
@@ -1479 +1479 @@
     AForm := TDpiForm(Instance);
     UpdateMainForm(AForm);
-    if FMainForm = AForm then AForm.GetVclForm.HandleNeeded;
+    if FMainForm = AForm then AForm.GetNativeForm.HandleNeeded;
     if AForm.FormStyle = fsSplash then begin
       // show the splash form and handle the paint message
@@ -1497 +1497 @@
 { TDpiJpegImage }
 
-function TDpiJpegImage.GetVclBitmap: TCustomBitmap;
-begin
-  Result := GetVclJpeg;
-end;
-
-function TDpiJpegImage.GetVclJpeg: TJPEGImage;
-begin
-  if not Assigned(VclJpeg) then VclJpeg := TJPEGImage.Create;
-  Result := VclJpeg;
+function TDpiJpegImage.GetNativeBitmap: TCustomBitmap;
+begin
+  Result := GetNativeJpeg;
+end;
+
+function TDpiJpegImage.GetNativeJpeg: TJPEGImage;
+begin
+  if not Assigned(NativeJpeg) then NativeJpeg := TJPEGImage.Create;
+  Result := NativeJpeg;
 end;
 
@@ -1511 +1511 @@
 begin
   inherited;
-  VclGraphicClass := TJPEGImage;
+  NativeGraphicClass := TJPEGImage;
 end;
 
 { TDpiPortableNetworkGraphic }
 
-function TDpiPortableNetworkGraphic.GetVclBitmap: TCustomBitmap;
-begin
-  Result := GetVclPng;
-end;
-
-function TDpiPortableNetworkGraphic.GetVclPng: TPortableNetworkGraphic;
-begin
-  if not Assigned(VclPng) then VclPng := TPortableNetworkGraphic.Create;
-  Result := VclPng;
+function TDpiPortableNetworkGraphic.GetNativeBitmap: TCustomBitmap;
+begin
+  Result := GetNativePng;
+end;
+
+function TDpiPortableNetworkGraphic.GetNativePng: TPortableNetworkGraphic;
+begin
+  if not Assigned(NativePng) then NativePng := TPortableNetworkGraphic.Create;
+  Result := NativePng;
 end;
 
@@ -1530 +1530 @@
 begin
   inherited;
-  VclGraphicClass := TPortableNetworkGraphic;
+  NativeGraphicClass := TPortableNetworkGraphic;
 end;
 
@@ -1537 +1537 @@
 function TDpiCustomControl.GetOnPaint: TNotifyEvent;
 begin
-  Result := GetVclCustomControl.OnPaint;
+  Result := GetNativeCustomControl.OnPaint;
 end;
 
 function TDpiCustomControl.GetPixelsPerInch: Integer;
 begin
-//  Result := GetVclCustomControl.P;
+//  Result := GetNativeCustomControl.P;
 end;
 
@@ -1549 +1549 @@
   if not Assigned(FCanvas) then begin
     FCanvas := TDpiCanvas.Create;
-    FCanvas.VclCanvas := GetVclCustomControl.Canvas;
+    FCanvas.NativeCanvas := GetNativeCustomControl.Canvas;
   end;
   Result := FCanvas;
@@ -1556 +1556 @@
 procedure TDpiCustomControl.SetOnPaint(AValue: TNotifyEvent);
 begin
-  GetVclCustomControl.OnPaint := AValue;
+  GetNativeCustomControl.OnPaint := AValue;
 end;
 
@@ -1564 +1564 @@
 end;
 
-function TDpiCustomControl.GetVclWinControl: TWinControl;
-begin
-  Result := GetVclCustomControl;
-end;
-
-function TDpiCustomControl.GetVclCustomControl: TCustomControl;
+function TDpiCustomControl.GetNativeWinControl: TWinControl;
+begin
+  Result := GetNativeCustomControl;
+end;
+
+function TDpiCustomControl.GetNativeCustomControl: TCustomControl;
 begin
   Result := nil;
@@ -1578 +1578 @@
 function TDpiScrollBar.GetBorderSpacing: TControlBorderSpacing;
 begin
-  Result := VclScrollBar.BorderSpacing;
+  Result := NativeScrollBar.BorderSpacing;
 end;
 
 function TDpiScrollBar.GetKind: TScrollBarKind;
 begin
-  Result := VclScrollBar.Kind;
+  Result := NativeScrollBar.Kind;
 end;
 
 function TDpiScrollBar.GetMax: Integer;
 begin
-  Result := VclScrollBar.Max;
+  Result := NativeScrollBar.Max;
 end;
 
 function TDpiScrollBar.GetMin: Integer;
 begin
-  Result := VclScrollBar.Min;
+  Result := NativeScrollBar.Min;
 end;
 
 function TDpiScrollBar.GetOnChange: TNotifyEvent;
 begin
-  Result := VclScrollBar.OnChange;
+  Result := NativeScrollBar.OnChange;
 end;
 
 function TDpiScrollBar.GetPageSize: Integer;
 begin
-  Result := VclScrollBar.PageSize;
+  Result := NativeScrollBar.PageSize;
 end;
 
 function TDpiScrollBar.GetPosition: Integer;
 begin
-  Result := VclScrollBar.Position;
+  Result := NativeScrollBar.Position;
 end;
 
 procedure TDpiScrollBar.SetBorderSpacing(AValue: TControlBorderSpacing);
 begin
-  VclScrollBar.BorderSpacing := AValue;
+  NativeScrollBar.BorderSpacing := AValue;
 end;
 
 procedure TDpiScrollBar.SetKind(AValue: TScrollBarKind);
 begin
-  VclScrollBar.Kind := AValue;
+  NativeScrollBar.Kind := AValue;
 end;
 
 procedure TDpiScrollBar.SetMax(AValue: Integer);
 begin
-  VclScrollBar.Max := AValue;
+  NativeScrollBar.Max := AValue;
 end;
 
 procedure TDpiScrollBar.SetMin(AValue: Integer);
 begin
-  VclScrollBar.Min := Avalue;
+  NativeScrollBar.Min := Avalue;
 end;
 
 procedure TDpiScrollBar.SetOnChange(AValue: TNotifyEvent);
 begin
-  VclScrollBar.OnChange := AValue;
+  NativeScrollBar.OnChange := AValue;
 end;
 
 procedure TDpiScrollBar.SetPageSize(AValue: Integer);
 begin
-  VclScrollBar.PageSize := AValue;
+  NativeScrollBar.PageSize := AValue;
 end;
 
 procedure TDpiScrollBar.SetPosition(AValue: Integer);
 begin
-  VclScrollBar.Position := AValue;
-end;
-
-function TDpiScrollBar.GetVclControl: TControl;
-begin
-  if not Assigned(VclScrollBar) then VclScrollBar := TScrollBar.Create(nil);
-  Result := VclScrollBar;
+  NativeScrollBar.Position := AValue;
+end;
+
+function TDpiScrollBar.GetNativeControl: TControl;
+begin
+  if not Assigned(NativeScrollBar) then NativeScrollBar := TScrollBar.Create(nil);
+  Result := NativeScrollBar;
 end;
 
 destructor TDpiScrollBar.Destroy;
 begin
-  FreeAndNil(VclScrollBar);
+  FreeAndNil(NativeScrollBar);
   inherited Destroy;
 end;
@@ -1662 +1662 @@
 function TDpiRasterImage.GetRawImage: TRawImage;
 begin
-  Result := GetVclRasterImage.RawImage;
-end;
-
-function TDpiRasterImage.GetVclRasterImage: TRasterImage;
-begin
-  Result := GetVclRasterImage;
-end;
-
-function TDpiRasterImage.GetVclGraphic: TGraphic;
-begin
-  Result := GetVclRasterImage;
+  Result := GetNativeRasterImage.RawImage;
+end;
+
+function TDpiRasterImage.GetNativeRasterImage: TRasterImage;
+begin
+  Result := GetNativeRasterImage;
+end;
+
+function TDpiRasterImage.GetNativeGraphic: TGraphic;
+begin
+  Result := GetNativeRasterImage;
 end;
 
 { TDpiGraphic }
 
-function TDpiGraphic.GetVclGraphic: TGraphic;
+function TDpiGraphic.GetNativeGraphic: TGraphic;
 begin
   Result := nil;
@@ -1706 +1706 @@
   Bitmap: TGraphic;
 begin
-  Bitmap := VclGraphicClass.Create;
+  Bitmap := NativeGraphicClass.Create;
   Bitmap.LoadFromFile(FileName);
   Width := Bitmap.Width;
   Height := Bitmap.Height;
   if Self is TDpiBitmap then
-    TBitmap(GetVclGraphic).Canvas.StretchDraw(Bounds(0, 0,
-    TBitmap(GetVclGraphic).Width, TBitmap(GetVclGraphic).Height), Bitmap)
+    TBitmap(GetNativeGraphic).Canvas.StretchDraw(Bounds(0, 0,
+    TBitmap(GetNativeGraphic).Width, TBitmap(GetNativeGraphic).Height), Bitmap)
     else raise Exception.Create('Unsupported class ' + Self.ClassName);
   Bitmap.Free;
@@ -1721 +1721 @@
   Bitmap: TGraphic;
 begin
-  Bitmap := VclGraphicClass.Create;
+  Bitmap := NativeGraphicClass.Create;
   Bitmap.Width := Width;
   Bitmap.Height := Height;
   if Self is TDpiBitmap then begin
     if Bitmap is TRasterImage then
-      (Bitmap as TRasterImage).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), TBitmap(GetVclGraphic))
+      (Bitmap as TRasterImage).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), TBitmap(GetNativeGraphic))
       else raise Exception.Create('Expected TRasterImage but got ' + Bitmap.ClassName);
   end else raise Exception.Create('Unsupported class ' + Self.ClassName);
@@ -1744 +1744 @@
   if not Assigned(FCanvas) then begin
     FCanvas := TDpiCanvas.Create;
-    FCanvas.VclCanvas := GetVclBitmap.Canvas;
+    FCanvas.NativeCanvas := GetNativeBitmap.Canvas;
   end;
   Result := FCanvas;
@@ -1751 +1751 @@
 function TDpiBitmap.GetPixelFormat: TPixelFormat;
 begin
-  Result := GetVclBitmap.PixelFormat;
+  Result := GetNativeBitmap.PixelFormat;
 end;
 
 function TDpiBitmap.GetScanLine(Row: Integer): Pointer;
 begin
-  Result := GetVclBitmap.ScanLine[Row];
+  Result := GetNativeBitmap.ScanLine[Row];
 end;
 
@@ -1767 +1767 @@
 begin
   FHeight := AValue;
-  GetVclBitmap.Height := ScaleToVcl(AValue);
+  GetNativeBitmap.Height := ScaleToNative(AValue);
 end;
 
 procedure TDpiBitmap.SetPixelFormat(AValue: TPixelFormat);
 begin
-  GetVclBitmap.PixelFormat := AValue;
+  GetNativeBitmap.PixelFormat := AValue;
 end;
 
@@ -1778 +1778 @@
 begin
   FWidth := AValue;
-  GetVclBitmap.Width := ScaleToVcl(AValue);
+  GetNativeBitmap.Width := ScaleToNative(AValue);
 end;
 
@@ -1787 +1787 @@
   NewHeight: Integer;
 begin
-  NewWidth := ScaleToVcl(Width);
-  NewHeight := ScaleToVcl(Height);
-  if Assigned(VclBitmap) and ((NewWidth <> VclBitmap.Width) or (NewHeight <> VclBitmap.Height)) then begin
+  NewWidth := ScaleToNative(Width);
+  NewHeight := ScaleToNative(Height);
+  if Assigned(NativeBitmap) and ((NewWidth <> NativeBitmap.Width) or (NewHeight <> NativeBitmap.Height)) then begin
     // Rescale bitmap to new size
     Bitmap := TBitmap.Create;
     Bitmap.SetSize(NewWidth, NewHeight);
-    Bitmap.PixelFormat := VclBitmap.PixelFormat;
-    Bitmap.Canvas.StretchDraw(Bounds(0, 0, NewWidth, NewHeight), VclBitmap);
-    VclBitmap.Free;
-    VclBitmap := Bitmap;
-    Canvas.VclCanvas := VclBitmap.Canvas;
-  end;
-end;
-
-function TDpiBitmap.GetVclBitmap: TCustomBitmap;
-begin
-  if not Assigned(VclBitmap) then begin
-    VclBitmap := TBitmap.Create;
-    Canvas.VclCanvas := VclBitmap.Canvas;
-  end;
-  Result := VclBitmap;
+    Bitmap.PixelFormat := NativeBitmap.PixelFormat;
+    Bitmap.Canvas.StretchDraw(Bounds(0, 0, NewWidth, NewHeight), NativeBitmap);
+    NativeBitmap.Free;
+    NativeBitmap := Bitmap;
+    Canvas.NativeCanvas := NativeBitmap.Canvas;
+  end;
+end;
+
+function TDpiBitmap.GetNativeBitmap: TCustomBitmap;
+begin
+  if not Assigned(NativeBitmap) then begin
+    NativeBitmap := TBitmap.Create;
+    Canvas.NativeCanvas := NativeBitmap.Canvas;
+  end;
+  Result := NativeBitmap;
 end;
 
 procedure TDpiBitmap.BeginUpdate;
 begin
-  GetVclBitmap.BeginUpdate;
+  GetNativeBitmap.BeginUpdate;
 end;
 
 procedure TDpiBitmap.EndUpdate;
 begin
-  GetVclBitmap.EndUpdate;
+  GetNativeBitmap.EndUpdate;
 end;
 
@@ -1824 +1824 @@
   FWidth := AWidth;
   FHeight := AHeight;
-  GetVclBitmap.SetSize(ScaleToVcl(AWidth), ScaleToVcl(AHeight));
+  GetNativeBitmap.SetSize(ScaleToNative(AWidth), ScaleToNative(AHeight));
 end;
 
@@ -1830 +1830 @@
 begin
   inherited;
-  VclGraphicClass := TBitmap;
+  NativeGraphicClass := TBitmap;
 end;
 
@@ -1836 +1836 @@
 begin
   FreeAndNil(FCanvas);
-  FreeAndNil(VclBitmap);
+  FreeAndNil(NativeBitmap);
   inherited;
 end;
@@ -1843 +1843 @@
 begin
   if Source is TDpiBitmap then begin
-    GetVclBitmap.Assign((Source as TDpiBitmap).GetVclBitmap);
+    GetNativeBitmap.Assign((Source as TDpiBitmap).GetNativeBitmap);
   end else inherited;
 end;
 
-function TDpiBitmap.GetVclRasterImage: TRasterImage;
-begin
-  Result := GetVclBitmap;
+function TDpiBitmap.GetNativeRasterImage: TRasterImage;
+begin
+  Result := GetNativeBitmap;
 end;
 
@@ -1856 +1856 @@
 function TDpiListBox.GetBorderStyle: TBorderStyle;
 begin
-  Result := GetVclListBox.BorderStyle;
+  Result := GetNativeListBox.BorderStyle;
 end;
 
 function TDpiListBox.GetCount: Integer;
 begin
-  Result := GetVclListBox.Count;
+  Result := GetNativeListBox.Count;
 end;
 
 function TDpiListBox.GetExtendedSelect: Boolean;
 begin
-  Result := GetVclListBox.ExtendedSelect;
+  Result := GetNativeListBox.ExtendedSelect;
 end;
 
 function TDpiListBox.GetIntegralHeight: Boolean;
 begin
-  Result := GetVclListBox.IntegralHeight;
+  Result := GetNativeListBox.IntegralHeight;
 end;
 
 function TDpiListBox.GetItemHeight: Integer;
 begin
-  Result := GetVclListBox.ItemHeight;
+  Result := GetNativeListBox.ItemHeight;
 end;
 
 function TDpiListBox.GetItemIndex: Integer;
 begin
-  Result := GetVclListBox.ItemIndex;
+  Result := GetNativeListBox.ItemIndex;
 end;
 
 function TDpiListBox.GetItems: TStrings;
 begin
-  Result := GetVclListBox.Items;
+  Result := GetNativeListBox.Items;
 end;
 
 function TDpiListBox.GetParentFont: Boolean;
 begin
-  Result := GetVclListBox.ParentFont;
+  Result := GetNativeListBox.ParentFont;
 end;
 
 function TDpiListBox.GetScrollWidth: Integer;
 begin
-  Result := GetVclListBox.ScrollWidth;
+  Result := GetNativeListBox.ScrollWidth;
 end;
 
 function TDpiListBox.GetTopIndex: Integer;
 begin
-  Result := GetVclListBox.TopIndex;
+  Result := GetNativeListBox.TopIndex;
 end;
 
 procedure TDpiListBox.SetBorderStyle(AValue: TBorderStyle);
 begin
-  GetVclListBox.BorderStyle := AValue;
+  GetNativeListBox.BorderStyle := AValue;
 end;
 
 procedure TDpiListBox.SetExtendedSelect(AValue: Boolean);
 begin
-  GetVclListBox.ExtendedSelect := AValue;
+  GetNativeListBox.ExtendedSelect := AValue;
 end;
 
 procedure TDpiListBox.SetIntegralHeight(AValue: Boolean);
 begin
-  GetVclListBox.IntegralHeight := AValue;
+  GetNativeListBox.IntegralHeight := AValue;
 end;
 
 procedure TDpiListBox.SetItemHeight(AValue: Integer);
 begin
-  GetVclListBox.ItemHeight := AValue;
+  GetNativeListBox.ItemHeight := AValue;
 end;
 
 procedure TDpiListBox.SetItemIndex(AValue: Integer);
 begin
-  GetVclListBox.ItemIndex := AValue;
+  GetNativeListBox.ItemIndex := AValue;
 end;
 
 procedure TDpiListBox.SetItems(AValue: TStrings);
 begin
-  GetVclListBox.Items := AValue;
+  GetNativeListBox.Items := AValue;
 end;
 
 procedure TDpiListBox.SetParentFont(AValue: Boolean);
 begin
-  GetVclListBox.ParentFont := AValue;
+  GetNativeListBox.ParentFont := AValue;
 end;
 
 procedure TDpiListBox.SetScrollWidth(AValue: Integer);
 begin
-  GetVclListBox.ScrollWidth := AValue;
+  GetNativeListBox.ScrollWidth := AValue;
 end;
 
 procedure TDpiListBox.SetTopIndex(AValue: Integer);
 begin
-  GetVclListBox.TopIndex := AValue;
-end;
-
-function TDpiListBox.GetVclWinControl: TWinControl;
-begin
-  Result := GetVclListBox;
-end;
-
-function TDpiListBox.GetVclListBox: TListBox;
-begin
-  if not Assigned(VclListBox) then VclListBox := TListBox.Create(nil);
-  Result := VclListBox;
+  GetNativeListBox.TopIndex := AValue;
+end;
+
+function TDpiListBox.GetNativeWinControl: TWinControl;
+begin
+  Result := GetNativeListBox;
+end;
+
+function TDpiListBox.GetNativeListBox: TListBox;
+begin
+  if not Assigned(NativeListBox) then NativeListBox := TListBox.Create(nil);
+  Result := NativeListBox;
 end;
 
 destructor TDpiListBox.Destroy;
 begin
-  FreeAndNil(VclListBox);
+  FreeAndNil(NativeListBox);
   inherited Destroy;
 end;
@@ -1968 +1968 @@
 { TDpiPaintBox }
 
-function TDpiPaintBox.GetVclGraphicControl: TGraphicControl;
-begin
-  if not Assigned(VclPaintBox) then VclPaintBox := TPaintBox.Create(nil);
-  Result := VclPaintBox;
+function TDpiPaintBox.GetNativeGraphicControl: TGraphicControl;
+begin
+  if not Assigned(NativePaintBox) then NativePaintBox := TPaintBox.Create(nil);
+  Result := NativePaintBox;
 end;
 
@@ -1978 +1978 @@
   inherited;
   Canvas := TDpiCanvas.Create;
-  Canvas.VclCanvas := VclPaintBox.Canvas;
-  Canvas.Font.VclFont := VclPaintBox.Canvas.Font;
-  UpdateVclControl;
+  Canvas.NativeCanvas := NativePaintBox.Canvas;
+  Canvas.Font.NativeFont := NativePaintBox.Canvas.Font;
+  UpdateNativeControl;
   ScreenChanged;
 end;
@@ -1986 +1986 @@
 destructor TDpiPaintBox.Destroy;
 begin
-  FreeAndNil(VclPaintBox);
+  FreeAndNil(NativePaintBox);
   inherited;
 end;
@@ -2006 +2006 @@
 function TDpiCanvas.GetBrush: TBrush;
 begin
-  Result := GetVclCanvas.Brush;
+  Result := GetNativeCanvas.Brush;
 end;
 
 function TDpiCanvas.GetHandle: HDC;
 begin
-  Result := GetVclCanvas.Handle;
+  Result := GetNativeCanvas.Handle;
 end;
 
 function TDpiCanvas.GetHeight: Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.Height);
+  Result := ScaleFromNative(GetNativeCanvas.Height);
 end;
 
 function TDpiCanvas.GetPen: TPen;
 begin
-  Result := GetVclCanvas.Pen;
+  Result := GetNativeCanvas.Pen;
 end;
 
 function TDpiCanvas.GetPixel(X, Y: Integer): TColor;
 begin
-  Result := GetVclCanvas.Pixels[ScaleToVcl(X), ScaleToVcl(Y)];
+  Result := GetNativeCanvas.Pixels[ScaleToNative(X), ScaleToNative(Y)];
 end;
 
 function TDpiCanvas.GetWidth: Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.Width);
+  Result := ScaleFromNative(GetNativeCanvas.Width);
 end;
 
 procedure TDpiCanvas.SetBrush(AValue: TBrush);
 begin
-  GetVclCanvas.Brush := AValue;
+  GetNativeCanvas.Brush := AValue;
 end;
 
@@ -2047 +2047 @@
 procedure TDpiCanvas.SetHandle(AValue: HDC);
 begin
-  GetVclCanvas.Handle := AValue;
+  GetNativeCanvas.Handle := AValue;
 end;
 
 procedure TDpiCanvas.SetPen(AValue: TPen);
 begin
-  GetVclCanvas.Pen := AValue;
+  GetNativeCanvas.Pen := AValue;
 end;
 
@@ -2060 +2060 @@
   BrushColor: TColor;
 begin
- { BrushStyle := GetVclCanvas.Brush.Style;
-  BrushColor := GetVclCanvas.Brush.Color;
-  GetVclCanvas.Brush.Color := AValue;
-  GetVclCanvas.Brush.Style := bsClear;
-  GetVclCanvas.FillRect(ScaleToVcl(X), ScaleToVcl(Y), ScaleToVcl(X + 1) - 1, ScaleToVcl(Y + 1) - 1);
-  GetVclCanvas.Brush.Style := BrushStyle;
-  GetVclCanvas.Brush.Color := BrushColor;
+ { BrushStyle := GetNativeCanvas.Brush.Style;
+  BrushColor := GetNativeCanvas.Brush.Color;
+  GetNativeCanvas.Brush.Color := AValue;
+  GetNativeCanvas.Brush.Style := bsClear;
+  GetNativeCanvas.FillRect(ScaleToNative(X), ScaleToNative(Y), ScaleToNative(X + 1) - 1, ScaleToNative(Y + 1) - 1);
+  GetNativeCanvas.Brush.Style := BrushStyle;
+  GetNativeCanvas.Brush.Color := BrushColor;
   }
-  GetVclCanvas.Pixels[ScaleToVcl(X), ScaleToVcl(Y)] := AValue;
-end;
-
-procedure TDpiCanvas.SetVclCanvas(AValue: TCanvas);
-begin
-  if FVclCanvas = AValue then Exit;
-  FVclCanvas := AValue;
-  FFont.VclFont := FVclCanvas.Font;
-end;
-
-function TDpiCanvas.GetVclCanvas: TCanvas;
-begin
-  //if not Assigned(VclCanvas) then VclCanvas := TCanvas.Create;
-  Result := VclCanvas;
+  GetNativeCanvas.Pixels[ScaleToNative(X), ScaleToNative(Y)] := AValue;
+end;
+
+procedure TDpiCanvas.SetNativeCanvas(AValue: TCanvas);
+begin
+  if FNativeCanvas = AValue then Exit;
+  FNativeCanvas := AValue;
+  FFont.NativeFont := FNativeCanvas.Font;
+end;
+
+function TDpiCanvas.GetNativeCanvas: TCanvas;
+begin
+  //if not Assigned(NativeCanvas) then NativeCanvas := TCanvas.Create;
+  Result := NativeCanvas;
 end;
 
@@ -2087 +2087 @@
   );
 begin
-  GetVclCanvas.StretchDraw(ScaleRectToVcl(DestRect), SrcGraphic.GetVclGraphic);
+  GetNativeCanvas.StretchDraw(ScaleRectToNative(DestRect), SrcGraphic.GetNativeGraphic);
 end;
 
 procedure TDpiCanvas.FrameRect(Rect: TRect);
 begin
-  GetVclCanvas.FrameRect(ScaleRectToVcl(Rect));
+  GetNativeCanvas.FrameRect(ScaleRectToNative(Rect));
 end;
 
 procedure TDpiCanvas.Rectangle(X1, Y1, X2, Y2: Integer);
 begin
-  GetVclCanvas.Rectangle(ScaleToVcl(X1), ScaleToVcl(Y1), ScaleToVcl(X2), ScaleToVcl(Y2));
+  GetNativeCanvas.Rectangle(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2), ScaleToNative(Y2));
 end;
 
@@ -2107 +2107 @@
 function TDpiCanvas.TextWidth(Text: string): Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.TextWidth(Text));
+  Result := ScaleFromNative(GetNativeCanvas.TextWidth(Text));
 end;
 
 function TDpiCanvas.TextHeight(Text: string): Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.TextHeight(Text));
+  Result := ScaleFromNative(GetNativeCanvas.TextHeight(Text));
 end;
 
 function TDpiCanvas.TextExtent(Text: string): TSize;
 begin
-  Result := ScaleSizeFromVcl(GetVclCanvas.TextExtent(Text));
+  Result := ScaleSizeFromNative(GetNativeCanvas.TextExtent(Text));
 end;
 
 procedure TDpiCanvas.TextOut(X, Y: Integer; Text: string);
 begin
-  GetVclCanvas.TextOut(ScaleToVcl(X), ScaleToVcl(Y), Text);
+  GetNativeCanvas.TextOut(ScaleToNative(X), ScaleToNative(Y), Text);
 end;
 
 procedure TDpiCanvas.TextRect(ARect: TRect; X, Y: Integer; Text: string);
 begin
-  GetVclCanvas.TextRect(ARect, ScaleToVcl(X), ScaleToVcl(Y), Text);
+  GetNativeCanvas.TextRect(ARect, ScaleToNative(X), ScaleToNative(Y), Text);
 end;
 
 procedure TDpiCanvas.MoveTo(X, Y: Integer);
 begin
-  GetVclCanvas.MoveTo(ScaleToVcl(X), ScaleToVcl(Y));
+  GetNativeCanvas.MoveTo(ScaleToNative(X), ScaleToNative(Y));
 end;
 
 procedure TDpiCanvas.LineTo(X, Y: Integer);
 begin
-  GetVclCanvas.LineTo(ScaleToVcl(X), ScaleToVcl(Y));
+  GetNativeCanvas.LineTo(ScaleToNative(X), ScaleToNative(Y));
 end;
 
 procedure TDpiCanvas.FillRect(ARect: TRect);
 begin
-  GetVclCanvas.FillRect(ScaleRectToVcl(ARect));
+  GetNativeCanvas.FillRect(ScaleRectToNative(ARect));
 end;
 
 procedure TDpiCanvas.FillRect(X1, Y1, X2, Y2: Integer);
 begin
-  GetVclCanvas.FillRect(ScaleToVcl(X1), ScaleToVcl(Y1), ScaleToVcl(X2), ScaleToVcl(Y2));
+  GetNativeCanvas.FillRect(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2), ScaleToNative(Y2));
 end;
 
 procedure TDpiCanvas.Draw(X, Y: Integer; Source: TDpiGraphic);
 begin
-  GetVclCanvas.Draw(ScaleToVcl(X), ScaleToVcl(Y), Source.GetVclGraphic);
+  GetNativeCanvas.Draw(ScaleToNative(X), ScaleToNative(Y), Source.GetNativeGraphic);
 end;
 
@@ -2158 +2158 @@
   Source: TRect);
 begin
-  GetVclCanvas.CopyRect(Dest, SrcCanvas.VclCanvas, ScaleRectToVcl(Source));
+  GetNativeCanvas.CopyRect(Dest, SrcCanvas.NativeCanvas, ScaleRectToNative(Source));
 end;
 
@@ -2191 +2191 @@
 end;
 
-function TDpiGraphicControl.GetVclControl: TControl;
-begin
-  Result := GetVclGraphicControl;
-end;
-
-function TDpiGraphicControl.GetVclGraphicControl: TGraphicControl;
-begin
-  if not Assigned(VclGraphicControl) then begin
-    VclGraphicControl := TGraphicControl.Create(nil);
-  end;
-  Result := VclGraphicControl;
-end;
-
-procedure TDpiGraphicControl.UpdateVclControl;
+function TDpiGraphicControl.GetNativeControl: TControl;
+begin
+  Result := GetNativeGraphicControl;
+end;
+
+function TDpiGraphicControl.GetNativeGraphicControl: TGraphicControl;
+begin
+  if not Assigned(NativeGraphicControl) then begin
+    NativeGraphicControl := TGraphicControl.Create(nil);
+  end;
+  Result := NativeGraphicControl;
+end;
+
+procedure TDpiGraphicControl.UpdateNativeControl;
 begin
   inherited;
-  TGraphicControlEx(GetVclGraphicControl).OnPaint := @PaintHandler;
+  TGraphicControlEx(GetNativeGraphicControl).OnPaint := @PaintHandler;
 end;
 
@@ -2224 +2224 @@
   inherited;
   FCanvas := TDpiCanvas.Create;
-  FCanvas.VclCanvas := GetVclGraphicControl.Canvas;
+  FCanvas.NativeCanvas := GetNativeGraphicControl.Canvas;
 end;
 
@@ -2240 +2240 @@
   if FStretch = AValue then Exit;
   FStretch := AValue;
-  VclImage.Stretch := AValue;
+  NativeImage.Stretch := AValue;
 end;
 
@@ -2249 +2249 @@
 end;
 
-function TDpiImage.GetVclControl: TControl;
-begin
-  if not Assigned(VclImage) then VclImage := TImage.Create(nil);
-  Result := VclImage;
+function TDpiImage.GetNativeControl: TControl;
+begin
+  if not Assigned(NativeImage) then NativeImage := TImage.Create(nil);
+  Result := NativeImage;
 end;
 
 destructor TDpiImage.Destroy;
 begin
-  FreeAndNil(VclImage);
+  FreeAndNil(NativeImage);
   inherited Destroy;
 end;
@@ -2267 +2267 @@
   if FSize = AValue then Exit;
   FSize := AValue;
-  GetVclFont.Size := AValue;
+  GetNativeFont.Size := AValue;
   DoChange;
 end;
@@ -2278 +2278 @@
 procedure TDpiFont.SetStyle(AValue: TFontStyles);
 begin
-  GetVclFont.Style := AValue;
+  GetNativeFont.Style := AValue;
 end;
 
@@ -2286 +2286 @@
 end;
 
-function TDpiFont.GetVclFont: TFont;
-begin
-  if not Assigned(VclFont) then VclFont := TFont.Create;
-  Result := VclFont;
+function TDpiFont.GetNativeFont: TFont;
+begin
+  if not Assigned(NativeFont) then NativeFont := TFont.Create;
+  Result := NativeFont;
 end;
 
@@ -2300 +2300 @@
 procedure TDpiFont.SetPixelsPerInch(AValue: Integer);
 begin
-  GetVclFont.PixelsPerInch := PixelsPerInch;
+  GetNativeFont.PixelsPerInch := PixelsPerInch;
 end;
 
 function TDpiFont.GetName: string;
 begin
-  Result := GetVclFont.Name;
+  Result := GetNativeFont.Name;
 end;
 
 function TDpiFont.GetColor: TColor;
 begin
-  Result := GetVclFont.Color;
+  Result := GetNativeFont.Color;
 end;
 
 function TDpiFont.GetCharSet: TFontCharSet;
 begin
-  Result := GetVclFont.CharSet;
+  Result := GetNativeFont.CharSet;
 end;
 
 function TDpiFont.GetHeight: Integer;
 begin
-  Result := GetVclFont.Height;
+  Result := GetNativeFont.Height;
 end;
 
 function TDpiFont.GetPixelsPerInch: Integer;
 begin
-  Result := GetVclFont.PixelsPerInch;
+  Result := GetNativeFont.PixelsPerInch;
 end;
 
 function TDpiFont.GetStyle: TFontStyles;
 begin
-  Result := GetVclFont.Style;
+  Result := GetNativeFont.Style;
 end;
 
 function TDpiFont.IsNameStored: Boolean;
 begin
-  Result := GetVclFont.Name <> 'default';
+  Result := GetNativeFont.Name <> 'default';
 end;
 
 procedure TDpiFont.SetCharSet(AValue: TFontCharSet);
 begin
-  GetVclFont.CharSet := AValue;
+  GetNativeFont.CharSet := AValue;
 end;
 
 procedure TDpiFont.SetColor(AValue: TColor);
 begin
-  GetVclFont.Color := AValue;
+  GetNativeFont.Color := AValue;
 end;
 
 procedure TDpiFont.SetHeight(AValue: Integer);
 begin
-  GetVclFont.Height := AValue;
+  GetNativeFont.Height := AValue;
 end;
 
 procedure TDpiFont.SetName(AValue: string);
 begin
-  GetVclFont.Name := AValue;
+  GetNativeFont.Name := AValue;
 end;
 
@@ -2371 +2371 @@
 begin
   if Source is TDpiFont then begin
-    GetVclFont.Assign((Source as TDpiFont).GetVclFont);
+    GetNativeFont.Assign((Source as TDpiFont).GetNativeFont);
     Size := (Source as TDpiFont).Size;
     FOnChange := (Source as TDpiFont).FOnChange;
@@ -2381 +2381 @@
 function TDpiWinControl.GetHandle: HWND;
 begin
-  Result := GetVclWinControl.Handle;
+  Result := GetNativeWinControl.Handle;
 end;
 
 function TDpiWinControl.GetOnKeyDown: TKeyEvent;
 begin
-  Result := GetVclWinControl.OnKeyDown;
+  Result := GetNativeWinControl.OnKeyDown;
 end;
 
 function TDpiWinControl.GetOnKeyPress: TKeyPressEvent;
 begin
-  Result := GetVclWinControl.OnKeyPress;
+  Result := GetNativeWinControl.OnKeyPress;
 end;
 
 function TDpiWinControl.GetOnKeyUp: TKeyEvent;
 begin
-  Result := GetVclWinControl.OnKeyUp;
+  Result := GetNativeWinControl.OnKeyUp;
 end;
 
 function TDpiWinControl.GetTabOrder: TTabOrder;
 begin
-  Result := GetVclWinControl.TabOrder;
+  Result := GetNativeWinControl.TabOrder;
 end;
 
 function TDpiWinControl.GetTabStop: Boolean;
 begin
-  Result := GetVclWinControl.TabStop;
+  Result := GetNativeWinControl.TabStop;
 end;
 
 procedure TDpiWinControl.SetHandle(AValue: HWND);
 begin
-  GetVclWinControl.Handle := AValue;
+  GetNativeWinControl.Handle := AValue;
 end;
 
 procedure TDpiWinControl.SetOnKeyDown(AValue: TKeyEvent);
 begin
-  GetVclWinControl.OnKeyDown := AValue;
+  GetNativeWinControl.OnKeyDown := AValue;
 end;
 
 procedure TDpiWinControl.SetOnKeyPress(AValue: TKeyPressEvent);
 begin
-  GetVclWinControl.OnKeyPress := AValue;
+  GetNativeWinControl.OnKeyPress := AValue;
 end;
 
 procedure TDpiWinControl.SetOnKeyUp(AValue: TKeyEvent);
 begin
-  GetVclWinControl.OnKeyUp := AValue;
+  GetNativeWinControl.OnKeyUp := AValue;
 end;
 
 procedure TDpiWinControl.SetTabOrder(AValue: TTabOrder);
 begin
-  GetVclWinControl.TabOrder := AValue;
+  GetNativeWinControl.TabOrder := AValue;
 end;
 
 procedure TDpiWinControl.SetTabStop(AValue: Boolean);
 begin
-  GetVclWinControl.TabStop := AValue;
-end;
-
-function TDpiWinControl.GetVclControl: TControl;
-begin
-  Result := GetVclWinControl;
-end;
-
-function TDpiWinControl.GetVclWinControl: TWinControl;
+  GetNativeWinControl.TabStop := AValue;
+end;
+
+function TDpiWinControl.GetNativeControl: TControl;
+begin
+  Result := GetNativeWinControl;
+end;
+
+function TDpiWinControl.GetNativeWinControl: TWinControl;
 begin
   Result := nil;
@@ -2487 +2487 @@
 function TDpiScreen.GetWidth: Integer;
 begin
-  Result := ScaleFromVcl(Screen.Width);
+  Result := ScaleFromNative(Screen.Width);
 end;
 
@@ -2502 +2502 @@
 function TDpiScreen.GetHeight: Integer;
 begin
-  Result := ScaleFromVcl(Screen.Height);
+  Result := ScaleFromNative(Screen.Height);
 end;
 
@@ -2578 +2578 @@
 end;
 
-procedure TDpiScreen.UpdateActiveFormFromVclScreen;
+procedure TDpiScreen.UpdateActiveFormFromNativeScreen;
 var
   I: Integer;
@@ -2587 +2587 @@
     for I := 0 to FormCount - 1 do begin
       F := Forms[I];
-      if F.GetVclForm = Screen.ActiveForm then begin
+      if F.GetNativeForm = Screen.ActiveForm then begin
         FActiveForm := F;
         Break;
@@ -2597 +2597 @@
 { TDpiButton }
 
-function TDpiButton.GetVclControl: TControl;
-begin
-  if not Assigned(VclButton) then VclButton := TButton.Create(nil);
-  Result := VclButton;
+function TDpiButton.GetNativeControl: TControl;
+begin
+  if not Assigned(NativeButton) then NativeButton := TButton.Create(nil);
+  Result := NativeButton;
 end;
 
 destructor TDpiButton.Destroy;
 begin
-  FreeAndNil(VclButton);
+  FreeAndNil(NativeButton);
   inherited;
 end;
@@ -2620 +2620 @@
 procedure TDpiControl.SetVisible(AValue: Boolean);
 begin
-  GetVclControl.Visible := AValue;
+  GetNativeControl.Visible := AValue;
 end;
 
@@ -2630 +2630 @@
 end;
 
-function TDpiControl.GetVclControl: TControl;
+function TDpiControl.GetNativeControl: TControl;
 begin
   Result := nil;
 end;
 
-procedure TDpiControl.UpdateVclControl;
-begin
-  Font.VclFont := GetVclControl.Font;
-  GetVclControl.OnResize := @VclFormResize;
-  GetVclControl.OnChangeBounds := @VclChangeBounds;
-  TControlEx(GetVclControl).OnMouseDown := @MouseDownHandler;
-  TControlEx(GetVclControl).OnMouseUp := @MouseUpHandler;
-  TControlEx(GetVclControl).OnMouseMove := @MouseMoveHandler;
-  TControlEx(GetVclControl).OnMouseEnter := @MouseEnterHandler;
-  TControlEx(GetVclControl).OnMouseLeave := @MouseLeaveHandler;
-  TControlEx(GetVclControl).OnMouseWheel := @MouseWheelHandler;
+procedure TDpiControl.UpdateNativeControl;
+begin
+  Font.NativeFont := GetNativeControl.Font;
+  GetNativeControl.OnResize := @NativeFormResize;
+  GetNativeControl.OnChangeBounds := @NativeChangeBounds;
+  TControlEx(GetNativeControl).OnMouseDown := @MouseDownHandler;
+  TControlEx(GetNativeControl).OnMouseUp := @MouseUpHandler;
+  TControlEx(GetNativeControl).OnMouseMove := @MouseMoveHandler;
+  TControlEx(GetNativeControl).OnMouseEnter := @MouseEnterHandler;
+  TControlEx(GetNativeControl).OnMouseLeave := @MouseLeaveHandler;
+  TControlEx(GetNativeControl).OnMouseWheel := @MouseWheelHandler;
 end;
 
@@ -2651 +2651 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  MouseDown(Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
-  if Assigned(FOnMouseDown) then FOnMouseDown(Self, Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
+  MouseDown(Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
+  if Assigned(FOnMouseDown) then FOnMouseDown(Self, Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
 end;
 
@@ -2658 +2658 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  MouseUp(Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
-  if Assigned(FOnMouseUp) then FOnMouseUp(Self, Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
+  MouseUp(Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
+  if Assigned(FOnMouseUp) then FOnMouseUp(Self, Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
 end;
 
@@ -2665 +2665 @@
   Y: Integer);
 begin
-  MouseMove(Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
-  if Assigned(FOnMouseMove) then FOnMouseMove(Self, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
+  MouseMove(Shift, ScaleFromNative(X), ScaleFromNative(Y));
+  if Assigned(FOnMouseMove) then FOnMouseMove(Self, Shift, ScaleFromNative(X), ScaleFromNative(Y));
 end;
 
@@ -2673 +2673 @@
 begin
   if Assigned(FOnMouseWheel) then FOnMouseWheel(Self, Shift, WheelDelta,
-    ScalePointFromVcl(MousePos), Handled);
+    ScalePointFromNative(MousePos), Handled);
 end;
 
@@ -2712 +2712 @@
 function TDpiControl.ScreenToClient(const APoint: TPoint): TPoint;
 begin
-  Result := ScalePointFromVcl(GetVclControl.ScreenToClient(ScalePointToVcl(APoint)));
+  Result := ScalePointFromNative(GetNativeControl.ScreenToClient(ScalePointToNative(APoint)));
 end;
 
 function TDpiControl.ClientToScreen(const APoint: TPoint): TPoint;
 begin
-  Result := ScalePointFromVcl(GetVclControl.ClientToScreen(ScalePointToVcl(APoint)));
+  Result := ScalePointFromNative(GetNativeControl.ClientToScreen(ScalePointToNative(APoint)));
 end;
 
@@ -2723 +2723 @@
   const OnVisibleChangedEvent: TNotifyEvent; AsFirst: boolean);
 begin
-  GetVclControl.AddHandlerOnVisibleChanged(OnVisibleChangedEvent, AsFirst);
+  GetNativeControl.AddHandlerOnVisibleChanged(OnVisibleChangedEvent, AsFirst);
 end;
 
@@ -2729 +2729 @@
   const OnVisibleChangedEvent: TNotifyEvent);
 begin
-  GetVclControl.RemoveHandlerOnVisibleChanged(OnVisibleChangedEvent);
+  GetNativeControl.RemoveHandlerOnVisibleChanged(OnVisibleChangedEvent);
 end;
 
@@ -2759 +2759 @@
 procedure TDpiControl.Invalidate;
 begin
-  GetVclControl.Invalidate;
+  GetNativeControl.Invalidate;
 end;
 
 procedure TDpiControl.Repaint;
 begin
-  GetVclControl.Repaint;
+  GetNativeControl.Repaint;
 end;
 
 procedure TDpiControl.Update;
 begin
-  GetVclControl.Update;
+  GetNativeControl.Update;
 end;
 
@@ -2791 +2791 @@
   if Assigned(TheOwner) and (TheOwner is TDpiWinControl) then
     Parent := TDpiWinControl(TheOwner);
-  GetVclControl;
-  UpdateVclControl;
+  GetNativeControl;
+  UpdateNativeControl;
   ScreenChanged;
 end;
@@ -2812 +2812 @@
 procedure TDpiControl.SetCaption(AValue: string);
 begin
-  GetVclControl.Caption := AValue;
+  GetNativeControl.Caption := AValue;
 end;
 
@@ -2821 +2821 @@
     FParent.Controls.Remove(Self);
     if Assigned(FParent) and (FParent is TDpiWinControl) then
-      GetVclControl.Parent := nil;
+      GetNativeControl.Parent := nil;
   end;
   FParent := AValue;
@@ -2827 +2827 @@
     FParent.Controls.Add(Self);
     if Assigned(FParent) and (FParent is TDpiWinControl) then
-      GetVclControl.Parent := TDpiWinControl(FParent).GetVclWinControl;
+      GetNativeControl.Parent := TDpiWinControl(FParent).GetNativeWinControl;
   end;
 end;
@@ -2839 +2839 @@
 procedure TDpiControl.SetHint(AValue: string);
 begin
-  GetVclControl.Hint := AValue;
+  GetNativeControl.Hint := AValue;
 end;
 
@@ -2852 +2852 @@
 function TDpiControl.GetAlign: TAlign;
 begin
-  Result := GetVclControl.Align;
+  Result := GetNativeControl.Align;
 end;
 
 function TDpiControl.GetAnchors: TAnchors;
 begin
-  Result := GetVclControl.Anchors;
+  Result := GetNativeControl.Anchors;
 end;
 
 function TDpiControl.GetClientHeight: Integer;
 begin
-  Result := ScaleFromVcl(GetVclControl.ClientHeight);
+  Result := ScaleFromNative(GetNativeControl.ClientHeight);
 end;
 
 function TDpiControl.GetClientWidth: Integer;
 begin
-  Result := ScaleFromVcl(GetVclControl.ClientWidth);
+  Result := ScaleFromNative(GetNativeControl.ClientWidth);
 end;
 
 function TDpiControl.GetColor: TColor;
 begin
-  Result := GetVclControl.Color;
+  Result := GetNativeControl.Color;
 end;
 
 function TDpiControl.GetCursor: TCursor;
 begin
-  Result := GetVclControl.Cursor;
+  Result := GetNativeControl.Cursor;
 end;
 
 function TDpiControl.GetEnabled: Boolean;
 begin
-  Result := GetVclControl.Enabled;
+  Result := GetNativeControl.Enabled;
 end;
 
 function TDpiControl.GetHint: string;
 begin
-  Result := GetVclControl.Hint;
+  Result := GetNativeControl.Hint;
 end;
 
 function TDpiControl.GetOnClick: TNotifyEvent;
 begin
-  Result := GetVclControl.OnClick;
+  Result := GetNativeControl.OnClick;
 end;
 
 function TDpiControl.GetShowHint: Boolean;
 begin
-  Result := GetVclControl.ShowHint;
+  Result := GetNativeControl.ShowHint;
 end;
 
 function TDpiControl.GetVisible: Boolean;
 begin
-  Result := GetVclControl.Visible;
+  Result := GetNativeControl.Visible;
 end;
 
@@ -2912 +2912 @@
 procedure TDpiControl.SetAlign(AValue: TAlign);
 begin
-  GetVclControl.Align := AValue;
+  GetNativeControl.Align := AValue;
 end;
 
 procedure TDpiControl.SetAnchors(AValue: TAnchors);
 begin
-  GetVclControl.Anchors := AValue;
+  GetNativeControl.Anchors := AValue;
 end;
 
@@ -2927 +2927 @@
 procedure TDpiControl.SetClientHeight(AValue: Integer);
 begin
-  GetVclControl.ClientHeight := ScaletoVcl(AValue);
+  GetNativeControl.ClientHeight := ScaleToNative(AValue);
 end;
 
 procedure TDpiControl.SetClientWidth(AValue: Integer);
 begin
-  GetVclControl.ClientWidth := ScaletoVcl(AValue);
+  GetNativeControl.ClientWidth := ScaleToNative(AValue);
 end;
 
 procedure TDpiControl.SetColor(AValue: TColor);
 begin
-  GetVclControl.Color := AValue;
+  GetNativeControl.Color := AValue;
 end;
 
 procedure TDpiControl.SetCursor(AValue: TCursor);
 begin
-  GetVclControl.Cursor := AValue;
+  GetNativeControl.Cursor := AValue;
 end;
 
 procedure TDpiControl.SetEnabled(AValue: Boolean);
 begin
-  GetVclControl.Enabled := AValue;
+  GetNativeControl.Enabled := AValue;
 end;
 
@@ -2958 +2958 @@
 procedure TDpiControl.SetOnClick(AValue: TNotifyEvent);
 begin
-  GetVclControl.OnClick := AValue;
+  GetNativeControl.OnClick := AValue;
 end;
 
@@ -2969 +2969 @@
 procedure TDpiControl.SetShowHint(AValue: Boolean);
 begin
-  GetVclControl.ShowHint := AValue;
-end;
-
-procedure TDpiControl.VclFormResize(Sender: TObject);
-begin
-  BoundsRect := ScaleRectFromVcl(GetVclControl.BoundsRect);
+  GetNativeControl.ShowHint := AValue;
+end;
+
+procedure TDpiControl.NativeFormResize(Sender: TObject);
+begin
+  BoundsRect := ScaleRectFromNative(GetNativeControl.BoundsRect);
   DoFormResize;
 end;
 
-procedure TDpiControl.VclChangeBounds(Sender: TObject);
+procedure TDpiControl.NativeChangeBounds(Sender: TObject);
 var
   NewBounds: TRect;
 begin
-  NewBounds := ScaleRectFromVcl(GetVclControl.BoundsRect);
+  NewBounds := ScaleRectFromNative(GetNativeControl.BoundsRect);
   if NewBounds <> BoundsRect then begin
     BoundsRect := NewBounds;
@@ -3001 +3001 @@
 function TDpiControl.GetCaption: string;
 begin
-  Result := GetVclControl.Caption;
+  Result := GetNativeControl.Caption;
 end;
 
 procedure TDpiControl.FontChanged(Sender: TObject);
 begin
-  GetVclControl.Font.Size := ScaleToVcl(Font.Size);
+  GetNativeControl.Font.Size := ScaleToNative(Font.Size);
 end;
 
 procedure TDpiControl.UpdateBounds;
 begin
-  GetVclControl.BoundsRect := ScaleRectToVcl(BoundsRect);
+  GetNativeControl.BoundsRect := ScaleRectToNative(BoundsRect);
 end;
 
@@ -3051 +3051 @@
 function TDpiForm.GetBorderIcons: TBorderIcons;
 begin
-  Result := GetVclForm.BorderIcons;
+  Result := GetNativeForm.BorderIcons;
 end;
 
 function TDpiForm.GetBorderStyle: TFormBorderStyle;
 begin
-  Result := GetVclForm.BorderStyle;
+  Result := GetNativeForm.BorderStyle;
 end;
 
 function TDpiForm.GetDesignTimePPI: Integer;
 begin
-  Result := GetVclForm.DesignTimePPI;
+  Result := GetNativeForm.DesignTimePPI;
 end;
 
 function TDpiForm.GetFormState: TFormState;
 begin
-  Result := GetVclForm.FormState;
+  Result := GetNativeForm.FormState;
 end;
 
 function TDpiForm.GetFormStyle: TFormStyle;
 begin
-  Result := GetVclForm.FormStyle;
+  Result := GetNativeForm.FormStyle;
 end;
 
 function TDpiForm.GetKeyPreview: Boolean;
 begin
-  Result := GetVclForm.KeyPreview;
+  Result := GetNativeForm.KeyPreview;
 end;
 
 function TDpiForm.GetLCLVersion: string;
 begin
-  Result := GetVclForm.LCLVersion;
+  Result := GetNativeForm.LCLVersion;
 end;
 
 function TDpiForm.GetModalResult: TModalResult;
 begin
-  Result := GetVclForm.ModalResult;
+  Result := GetNativeForm.ModalResult;
 end;
 
 function TDpiForm.GetOnCloseQuery: TCloseQueryEvent;
 begin
-  Result := GetVclForm.OnCloseQuery;
+  Result := GetNativeForm.OnCloseQuery;
 end;
 
 function TDpiForm.GetOnCreate: TNotifyEvent;
 begin
-  Result := GetVclForm.OnCreate;
+  Result := GetNativeForm.OnCreate;
 end;
 
 function TDpiForm.GetOnDeactivate: TNotifyEvent;
 begin
-  Result := GetVclForm.OnDeactivate;
+  Result := GetNativeForm.OnDeactivate;
 end;
 
 function TDpiForm.GetOnDestroy: TNotifyEvent;
 begin
-  Result := GetVclForm.OnDestroy;
+  Result := GetNativeForm.OnDestroy;
 end;
 
 function TDpiForm.GetOnHide: TNotifyEvent;
 begin
-  Result := GetVclForm.OnHide;
+  Result := GetNativeForm.OnHide;
 end;
 
 function TDpiForm.GetOnShow: TNotifyEvent;
 begin
-  Result := GetVclForm.OnShow;
+  Result := GetNativeForm.OnShow;
 end;
 
 function TDpiForm.GetPosition: TPosition;
 begin
-  Result := GetVclForm.Position;
+  Result := GetNativeForm.Position;
 end;
 
 function TDpiForm.GetWindowState: TWindowState;
 begin
-  Result := GetVclForm.WindowState;
+  Result := GetNativeForm.WindowState;
 end;
 
 procedure TDpiForm.SetBorderIcons(AValue: TBorderIcons);
 begin
-  GetVclForm.BorderIcons := AValue;
+  GetNativeForm.BorderIcons := AValue;
 end;
 
 procedure TDpiForm.SetBorderStyle(AValue: TFormBorderStyle);
 begin
-  GetVclForm.BorderStyle := AValue;
+  GetNativeForm.BorderStyle := AValue;
 end;
 
 procedure TDpiForm.SetDesignTimePPI(AValue: Integer);
 begin
-  GetVclForm.DesignTimePPI := AValue;
+  GetNativeForm.DesignTimePPI := AValue;
 end;
 
 procedure TDpiForm.SetFormStyle(AValue: TFormStyle);
 begin
-  GetVclForm.FormStyle := AValue;
+  GetNativeForm.FormStyle := AValue;
 end;
 
 procedure TDpiForm.SetKeyPreview(AValue: Boolean);
 begin
-  GetVclForm.KeyPreview := AValue;
+  GetNativeForm.KeyPreview := AValue;
 end;
 
 procedure TDpiForm.SetLCLVersion(AValue: string);
 begin
-  GetVclForm.LCLVersion := AValue;
+  GetNativeForm.LCLVersion := AValue;
 end;
 
 procedure TDpiForm.SetModalResult(AValue: TModalResult);
 begin
-  GetVclForm.ModalResult := AValue;
+  GetNativeForm.ModalResult := AValue;
 end;
 
 procedure TDpiForm.SetOnCloseQuery(AValue: TCloseQueryEvent);
 begin
-  GetVclForm.OnCloseQuery := AValue;
+  GetNativeForm.OnCloseQuery := AValue;
 end;
 
 procedure TDpiForm.SetOnCreate(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnCreate := AValue;
+  GetNativeForm.OnCreate := AValue;
 end;
 
 procedure TDpiForm.SetOnDeactivate(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnDeactivate := AValue;
+  GetNativeForm.OnDeactivate := AValue;
 end;
 
 procedure TDpiForm.SetOnDestroy(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnDestroy := AValue;
+  GetNativeForm.OnDestroy := AValue;
 end;
 
 procedure TDpiForm.SetOnHide(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnHide := AValue;
+  GetNativeForm.OnHide := AValue;
 end;
 
 procedure TDpiForm.SetOnShow(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnShow := AValue;
+  GetNativeForm.OnShow := AValue;
 end;
 
 procedure TDpiForm.DoOnCreate;
 begin
-  if Assigned(GetVclForm.OnCreate) then
-    GetVclForm.OnCreate(Self);
+  if Assigned(GetNativeForm.OnCreate) then
+    GetNativeForm.OnCreate(Self);
 end;
 
@@ -3207 +3207 @@
 procedure TDpiForm.SetPosition(AValue: TPosition);
 begin
-  GetVclForm.Position := AValue;
+  GetNativeForm.Position := AValue;
 end;
 
 procedure TDpiForm.SetWindowState(AValue: TWindowState);
 begin
-  GetVclForm.WindowState := AValue;
+  GetNativeForm.WindowState := AValue;
 end;
 
@@ -3225 +3225 @@
 begin
   DpiScreen.FActiveForm := DpiScreen.FActiveFormPrev;
-  //DpiScreen.UpdateActiveFormFromVclScreen;
+  //DpiScreen.UpdateActiveFormFromNativeScreen;
   if Assigned(FOnDeactivate) then FOnDeactivate(Sender);
 end;
@@ -3246 +3246 @@
 procedure TDpiForm.CreateParams(var p: TCreateParams);
 begin
-  // TODO: VclForm.CreateParams(P);
+  // TODO: NativeForm.CreateParams(P);
 end;
 
@@ -3265 +3265 @@
 end;
 
-function TDpiForm.GetVclScrollingWinControl: TScrollingWinControl;
-begin
-  Result := GetVclForm;
-end;
-
-function TDpiForm.GetVclForm: TForm;
-begin
-  if not Assigned(VclForm) then begin
-    VclForm := TFormEx.CreateNew(nil);
-    (VclForm as TFormEx).OnMessage := @FormMessageHandler;
-    //VclForm := TForm.Create(nil);
-  end;
-  Result := VclForm;
-end;
-
-procedure TDpiForm.UpdateVclControl;
+function TDpiForm.GetNativeScrollingWinControl: TScrollingWinControl;
+begin
+  Result := GetNativeForm;
+end;
+
+function TDpiForm.GetNativeForm: TForm;
+begin
+  if not Assigned(NativeForm) then begin
+    NativeForm := TFormEx.CreateNew(nil);
+    (NativeForm as TFormEx).OnMessage := @FormMessageHandler;
+    //NativeForm := TForm.Create(nil);
+  end;
+  Result := NativeForm;
+end;
+
+procedure TDpiForm.UpdateNativeControl;
 begin
   inherited;
-  GetVclForm.OnActivate := @ActivateHandler;
-  GetVclForm.OnDeactivate := @DeactivateHandler;
-  GetVclForm.OnClose := @CloseHandler;
-  GetVclForm.OnCloseQuery := @CloseQueryHandler;
-  GetVclForm.Name := Name + 'Vcl';
+  GetNativeForm.OnActivate := @ActivateHandler;
+  GetNativeForm.OnDeactivate := @DeactivateHandler;
+  GetNativeForm.OnClose := @CloseHandler;
+  GetNativeForm.OnCloseQuery := @CloseQueryHandler;
+  GetNativeForm.Name := Name + 'Native';
 end;
 
@@ -3298 +3298 @@
 function TDpiForm.ShowModal: Integer;
 begin
-  Result := GetVclForm.ShowModal;
+  Result := GetNativeForm.ShowModal;
 end;
 
@@ -3358 +3358 @@
 procedure TDpiForm.BringToFront;
 begin
-  GetVclForm.BringToFront;
+  GetNativeForm.BringToFront;
 end;
 
@@ -3383 +3383 @@
   end;
   ScreenChanged;
-  UpdateVclControl;
+  UpdateNativeControl;
 end;
 
@@ -3395 +3395 @@
 begin
   // TODO: Can't destroy directly?
-  //FreeAndNil(VclForm);
+  //FreeAndNil(NativeForm);
   DpiScreen.RemoveForm(Self);
 end;
@@ -3401 +3401 @@
 initialization
 
-RegisterPropertyToSkip(TDpiForm, 'OldCreateOrder', 'VCL compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'TextHeight', 'VCL compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'Scaled', 'VCL compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'TransparentColorValue', 'VCL compatibility property', '');
+RegisterPropertyToSkip(TDpiForm, 'OldCreateOrder', 'Native compatibility property', '');
+RegisterPropertyToSkip(TDpiForm, 'TextHeight', 'Native compatibility property', '');
+RegisterPropertyToSkip(TDpiForm, 'Scaled', 'Native compatibility property', '');
+RegisterPropertyToSkip(TDpiForm, 'TransparentColorValue', 'Native compatibility property', '');
 DpiScreen := TDpiScreen.Create;
 DpiApplication := TDpiApplication.Create(nil);

branches/highdpi/Start.lfm

@@ -1 +1 @@
 object StartDlg: TStartDlg
+  Left = 246
+  Height = 326
+  Top = 120
+  Width = 556
+  BorderIcons = []
+  BorderStyle = bsNone
+  Caption = 'C-evo'
   ClientHeight = 326
   ClientWidth = 556
-  Top = 120
-  Left = 246
-  Width = 556
-  Height = 326
-  Caption = 'C-evo'
-  Enabled = True
-  ShowHint = False
+  Color = clBtnFace
+  DesignTimePPI = 144
   Font.Color = clWindowText
+  Font.Height = -13
   Font.Name = 'MS Sans Serif'
-  Font.PixelsPerInch = 144
-  Font.Height = -13
-  Align = alNone
-  Color = clBtnFace
+  FormStyle = fsStayOnTop
+  OnClose = FormClose
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  OnHide = FormHide
+  OnKeyDown = FormKeyDown
   OnMouseDown = FormMouseDown
   OnMouseMove = FormMouseMove
   OnMouseUp = FormMouseUp
-  OnKeyDown = FormKeyDown
   OnPaint = FormPaint
-  HorzScrollBar.Visible = False
-  VertScrollBar.Visible = False
-  DesignTimePPI = 144
-  FormStyle = fsStayOnTop
-  BorderStyle = bsNone
-  BorderIcons = []
-  LCLVersion = '2.0.8.0'
   OnShow = FormShow
-  OnHide = FormHide
-  OnCreate = FormCreate
-  OnDestroy = FormDestroy
-  OnClose = FormClose
+  LCLVersion = '2.0.2.0'
+  PixelsPerInch = 96
+  Scaled = False
   object StartBtn: TButtonA
     Tag = 15104
-    ClientHeight = 25
-    ClientWidth = 100
+    Left = 389
+    Height = 25
     Top = 286
-    Left = 389
     Width = 100
-    Height = 25
-    Enabled = True
-    ShowHint = False
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Down = False
+    Permanent = False
     OnClick = StartBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
   end
   object Down1Btn: TButtonC
     Tag = 4096
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 522
+    Height = 12
     Top = 111
-    Left = 522
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Down = False
+    Permanent = False
     OnClick = Down1BtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 0
   end
   object Up1Btn: TButtonC
     Tag = 4096
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 522
+    Height = 12
     Top = 99
-    Left = 522
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Down = False
+    Permanent = False
     OnClick = Up1BtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 1
   end
   object RenameBtn: TButtonB
     Tag = 10240
-    ClientHeight = 25
-    ClientWidth = 25
+    Left = 412
+    Height = 25
     Top = 98
-    Left = 412
-    Width = 25
-    Height = 25
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 25
+    Visible = False
+    Down = False
+    Permanent = False
     OnClick = RenameBtnClick
-    Visible = False
-    Down = False
-    Permanent = False
     ButtonIndex = 31
   end
   object DeleteBtn: TButtonB
     Tag = 10240
-    ClientHeight = 25
-    ClientWidth = 25
+    Left = 441
+    Height = 25
     Top = 98
-    Left = 441
-    Width = 25
-    Height = 25
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 25
+    Visible = False
+    Down = False
+    Permanent = False
     OnClick = DeleteBtnClick
-    Visible = False
-    Down = False
-    Permanent = False
     ButtonIndex = 21
   end
   object Down2Btn: TButtonC
     Tag = 6912
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 522
+    Height = 12
     Top = 249
-    Left = 522
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Visible = False
+    Down = False
+    Permanent = False
     OnClick = Down2BtnClick
-    Visible = False
-    Down = False
-    Permanent = False
     ButtonIndex = 0
   end
   object Up2Btn: TButtonC
     Tag = 6912
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 522
+    Height = 12
     Top = 237
-    Left = 522
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Visible = False
+    Down = False
+    Permanent = False
     OnClick = Up2BtnClick
-    Visible = False
-    Down = False
-    Permanent = False
     ButtonIndex = 1
   end
   object QuitBtn: TButtonB
     Tag = 268435200
-    ClientHeight = 25
-    ClientWidth = 25
+    Left = 530
+    Height = 25
     Top = 7
-    Left = 530
-    Width = 25
-    Height = 25
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 25
+    Down = False
+    Permanent = False
     OnClick = QuitBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 0
   end
   object CustomizeBtn: TButtonC
     Tag = 768
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 120
+    Height = 12
     Top = 302
-    Left = 120
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Down = False
+    Permanent = False
     OnClick = CustomizeBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 0
   end
   object AutoDiffUpBtn: TButtonC
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 280
+    Height = 12
     Top = 237
+    Width = 12
+    Down = False
+    Permanent = False
+    OnClick = AutoDiffUpBtnClick
+    ButtonIndex = 1
+  end
+  object AutoDiffDownBtn: TButtonC
     Left = 280
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
-    OnClick = AutoDiffUpBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
-    ButtonIndex = 1
-  end
-  object AutoDiffDownBtn: TButtonC
-    ClientHeight = 12
-    ClientWidth = 12
+    Height = 12
     Top = 249
-    Left = 280
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Down = False
+    Permanent = False
     OnClick = AutoDiffDownBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 0
   end
   object AutoEnemyUpBtn: TButtonC
-    ClientHeight = 12
-    ClientWidth = 12
+    Left = 206
+    Height = 12
     Top = 152
+    Width = 12
+    Down = False
+    Permanent = False
+    OnClick = AutoEnemyUpBtnClick
+    ButtonIndex = 1
+  end
+  object AutoEnemyDownBtn: TButtonC
     Left = 206
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
-    OnClick = AutoEnemyUpBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
-    ButtonIndex = 1
-  end
-  object AutoEnemyDownBtn: TButtonC
-    ClientHeight = 12
-    ClientWidth = 12
+    Height = 12
     Top = 164
-    Left = 206
-    Width = 12
-    Height = 12
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 12
+    Down = False
+    Permanent = False
     OnClick = AutoEnemyDownBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 0
   end
   object ReplayBtn: TButtonB
     Tag = 2048
-    ClientHeight = 25
-    ClientWidth = 25
+    Left = 352
+    Height = 25
     Top = 286
-    Left = 352
-    Width = 25
-    Height = 25
-    Enabled = True
-    ShowHint = True
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clBtnFace
+    Width = 25
+    Down = False
+    Permanent = False
     OnClick = ReplayBtnClick
-    Visible = True
-    Down = False
-    Permanent = False
     ButtonIndex = 19
   end
   object List: TDpiListBox
     Tag = 15360
-    ClientHeight = 238
-    ClientWidth = 266
+    Left = 45
+    Height = 238
     Top = 64
-    Left = 45
     Width = 266
-    Height = 238
-    Enabled = True
-    ShowHint = False
+    BorderStyle = bsNone
+    Color = clBlack
+    ExtendedSelect = False
     Font.Color = 4176863
+    Font.Height = -15
     Font.Name = 'Times New Roman'
     Font.Style = [fsBold]
-    Font.PixelsPerInch = 144
-    Font.Height = -15
-    Align = alNone
-    Color = clBlack
+    IntegralHeight = True
+    ItemHeight = 0
     OnClick = ListClick
+    ParentFont = False
+    ScrollWidth = 266
     TabOrder = 0
-    TabStop = True
+    TabStop = False
     TopIndex = -1
-    ScrollWidth = 266
-    ParentFont = False
-    ItemHeight = 0
-    IntegralHeight = True
-    ExtendedSelect = False
-    BorderStyle = bsSingle
     Visible = False
   end

branches/highdpi/Start.pas

@@ -48 +48 @@
     Bitmap: TDpiBitmap; { game world sample preview }
     Size: TPoint;
-    Colors: array [0..fTerrain, 0..1] of TColor;
+    Colors: array [0 .. 11, 0 .. 1] of TColor;
     Mode: TMiniMode;
     procedure LoadFromLogFile(FileName: string; var LastTurn: Integer);
@@ -355 +355 @@
   Bitmap.BeginUpdate;
   MiniPixel := PixelPointer(Bitmap);
-  for y := 0 to ScaleToVcl(Size.Y) - 1 do begin
-    for x := 0 to ScaleToVcl(Size.X) - 1 do begin
+  for y := 0 to ScaleToNative(Size.Y) - 1 do begin
+    for x := 0 to ScaleToNative(Size.X) - 1 do begin
       for i := 0 to 1 do begin
-        xm := (x * 2 + i + y and 1) mod (ScaleToVcl(Size.X) * 2);
+        xm := (x * 2 + i + y and 1) mod (ScaleToNative(Size.X) * 2);
         MiniPixel.SetX(xm);
         cm := Colors
-          [Map[ScaleFromVcl(x) * lxmax div Size.X + lxmax *
-          ((ScaleFromVcl(y) * (lymax - 1) + Size.Y div 2) div (Size.Y - 1))] and
+          [Map[ScaleFromNative(x) * lxmax div Size.X + lxmax *
+          ((ScaleFromNative(y) * (lymax - 1) + Size.Y div 2) div (Size.Y - 1))] and
           fTerrain, i];
         MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
@@ -388 +388 @@
     MiniPixel := PixelPointer(Bitmap);
     PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
-    for y := 0 to ScaleToVcl(Size.Y) - 1 do begin
-      for x := 0 to ScaleToVcl(Size.X) - 1 do begin
+    for y := 0 to ScaleToNative(Size.Y) - 1 do begin
+      for x := 0 to ScaleToNative(Size.X) - 1 do begin
         for i := 0 to 1 do begin
-          xm := (x * 2 + i + y and 1) mod (ScaleToVcl(Size.X) * 2);
+          xm := (x * 2 + i + y and 1) mod (ScaleToNative(Size.X) * 2);
           MiniPixel.SetX(xm);
-          Tile := SaveMap[ScaleFromVcl(x) + Size.X * ScaleFromVcl(y)];
+          Tile := SaveMap[ScaleFromNative(x) + Size.X * ScaleFromNative(y)];
           if Tile and fTerrain = fUNKNOWN then
             cm := $000000
@@ -694 +694 @@
     Location := Point((DpiScreen.Width - 800) * 3 div 8,
       DpiScreen.Height - Height - (DpiScreen.Height - 600) div 3);
-    Left := Location.X;
-    Top := Location.Y;
+    BoundsRect := Bounds(Location.X, Location.Y, Width, Height);
 
     r0 := DpiCreateRectRgn(0, 0, Width, Height);
@@ -708 +707 @@
     DeleteObject(r0); // causes crash with Windows 95
   end else begin
-    Left := (DpiScreen.Width - Width) div 2;
-    Top := (DpiScreen.Height - Height) div 2;
+    BoundsRect := Bounds((DpiScreen.Width - Width) div 2,
+      (DpiScreen.Height - Height) div 2, Width, Height)
   end;
 end;
@@ -1609 +1608 @@
   if Tab <> tbNew then
     if List.Count > 0 then begin
-      if (List.Count > ListIndex[Tab]) then
+      if (ListIndex[Tab] < List.Count) and (ListIndex[Tab] >= 0) then
         List.ItemIndex := ListIndex[Tab]
         else List.ItemIndex := 0;