Changeset 468 for trunk/Packages/CevoComponents/ScreenTools.pas

Timestamp:

Dec 3, 2023, 11:28:08 AM (5 months ago)

Author:

chronos

Message:

• Added: High DPI support integrated into trunk branch. It can be enabled by adding DPI define to compiler parameters for main project and packages.

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (14 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -7 +7 @@
   Windows,
   {$ENDIF}
-  StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Math,
-  Forms, Menus, GraphType, GraphicSet, LazFileUtils, Texture;
+  StringTables, LCLIntf, LCLType, SysUtils, Classes, Math,
+  GraphType, GraphicSet, LazFileUtils, Texture,
+  {$IFDEF DPI}Dpi.Forms, Dpi.Menus, Dpi.Graphics, Dpi.Controls, Dpi.Common{$ELSE}
+  Forms, Menus, Graphics, Controls{$ENDIF};
 
 type
@@ -96 +98 @@
 procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Cardinal);
 procedure DarkenImage(Bitmap: TBitmap; Change: Integer);
+{$IFNDEF DPI}
 function ScaleToNative(Value: Integer): Integer;
 function ScaleFromNative(Value: Integer): Integer;
+{$ENDIF}
 procedure UnshareBitmap(Bitmap: TBitmap);
 procedure Gtk2Fix;
@@ -199 +203 @@
 
 uses
-  Directories, Sound, PixelPointer;
+  {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
+  Directories, Sound;
 
 var
@@ -419 +424 @@
         Jpeg.LoadFromFile(FileName);
         if not (gfNoGamma in Options) then
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
         Bmp.SetSize(Jpeg.Width, Jpeg.Height);
         Bmp.Canvas.Draw(0, 0, Jpeg);
@@ -434 +439 @@
         Png.LoadFromFile(FileName);
         if not (gfNoGamma in Options) then
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
         Bmp.SetSize(Png.Width, Png.Height);
         if (Png.RawImage.Description.Format = ricfGray) then
         begin
           // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
           CopyGray8BitTo24bitBitmap(Bmp, Png);
         end
@@ -454 +459 @@
         Bmp.LoadFromFile(FileName);
         if not (gfNoGamma in Options) then
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
         Result := True;
       except
@@ -634 +639 @@
   Height := ScaleToNative(Height);
   //Assert(Src.PixelFormat = pf8bit);
-  Assert(dst.PixelFormat = pf24bit);
+  Assert(dst.PixelFormat = TPixelFormat.pf24bit);
   if xDst < 0 then begin
     Width := Width + xDst;
@@ -821 +826 @@
   Height := ScaleToNative(Height);
   bmp.BeginUpdate;
-  Assert(bmp.PixelFormat = pf24bit);
+  Assert(bmp.PixelFormat = TPixelFormat.pf24bit);
   Height := Y + Height;
   PixelPtr := TPixelPointer.Create(Bmp, X, Y);
@@ -1524 +1529 @@
     Brush.Color := $000000;
     FillRect(Rect(X + Pos + abs(Growth), Y, X + Max, Y + 7));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
   end;
 end;
@@ -1627 +1632 @@
 end;
 
+{$IFNDEF DPI}
 function ScaleToNative(Value: Integer): Integer;
 begin
@@ -1636 +1642 @@
   Result := Value;
 end;
+{$ENDIF}
 
 procedure UnshareBitmap(Bitmap: TBitmap);
@@ -1691 +1698 @@
                   Size := Size * 10 + Byte(S[I]) - 48;
                 'B', 'b':
-                  UniFont[section].Style := UniFont[section].Style + [fsBold];
+                  UniFont[section].Style := UniFont[section].Style + [TFontStyle.fsBold];
                 'I', 'i':
-                  UniFont[section].Style := UniFont[section].Style + [fsItalic];
+                  UniFont[section].Style := UniFont[section].Style + [TFontStyle.fsItalic];
               end;
-            UniFont[section].Size := Round(Size * 72 / UniFont[section].PixelsPerInch);
+            UniFont[section].Size := Round(Size * ScaleToNative(72) / UniFont[section].PixelsPerInch);
           end;
         end;
@@ -1783 +1790 @@
 
   Colors := TBitmap.Create;
-  Colors.PixelFormat := pf24bit;
+  Colors.PixelFormat := TPixelFormat.pf24bit;
   Paper := TBitmap.Create;
-  Paper.PixelFormat := pf24bit;
+  Paper.PixelFormat := TPixelFormat.pf24bit;
   BigImp := TBitmap.Create;
-  BigImp.PixelFormat := pf24bit;
+  BigImp.PixelFormat := TPixelFormat.pf24bit;
   MainTexture := TTexture.Create;
   ClickFrameColor := HGrSystem.Data.Canvas.Pixels[187, 175];
@@ -1796 +1803 @@
 
   LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := pf24bit;
+  LogoBuffer.PixelFormat := TPixelFormat.pf24bit;
   LogoBuffer.SetSize(BigBook.Width, BigBook.Height);
 end;