Changeset 548 for trunk/Packages

Timestamp:

Apr 21, 2024, 10:57:18 AM (7 months ago)

Author:

chronos

Message:

• Fixed: Bad unit drawing in battle dialog.
• Modified: Code cleanup.

Location:

trunk/Packages

Files:

• CevoComponents/ButtonA.pas (modified) (1 diff)
• CevoComponents/CevoComponents.lpk (modified) (1 diff)
• CevoComponents/ScreenTools.pas (modified) (4 diffs)
• DpiControls/Dpi.Graphics.pas (modified) (4 diffs)
• DpiControls/DpiControls.lpk (modified) (1 diff)

trunk/Packages/CevoComponents/ButtonA.pas

@@ -12 +12 @@
   private
     FCaption: string;
-    procedure SetCaption(Text: string);
+    procedure SetCaption(Text: string); override;
     procedure SetFont(const Font: TFont);
   protected

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -31 +31 @@
       <Other>
         <CompilerMessages>
-          <IgnoredMessages idx5024="True"/>
+          <IgnoredMessages idx6058="True" idx5024="True"/>
         </CompilerMessages>
       </Other>

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -542 +542 @@
           OriginalColor := DataPixel.PixelARGB and $FFFFFF;
           if (OriginalColor = TransparentColor1) or (OriginalColor = TransparentColor2) then begin
-            MaskPixel.PixelR := $FF;
-            MaskPixel.PixelG := $FF;
-            MaskPixel.PixelB := $FF;
-            DataPixel.PixelR := 0;
-            DataPixel.PixelG := 0;
-            DataPixel.PixelB := 0;
+            MaskPixel.PixelRGB := $ffffff;
+            DataPixel.PixelRGB := 0;
           end else begin
-            MaskPixel.PixelR := 0;
-            MaskPixel.PixelG := 0;
-            MaskPixel.PixelB := 0;
+            MaskPixel.PixelRGB := 0;
           end;
           DataPixel.NextPixel;
@@ -1023 +1017 @@
       if X < 0 then
         if Y < 0 then
-          R := round(sqrt(sqr(X) + sqr(Y)))
+          R := Round(Sqrt(Sqr(X) + Sqr(Y)))
         else if Y >= Height then
-          R := round(sqrt(sqr(X) + sqr(Y - (Height - 1))))
+          R := Round(Sqrt(Sqr(X) + Sqr(Y - (Height - 1))))
         else
           R := -X
       else if X >= Width then
         if Y < 0 then
-          R := round(sqrt(sqr(X - (Width - 1)) + sqr(Y)))
+          R := Round(sqrt(Sqr(X - (Width - 1)) + Sqr(Y)))
         else if Y >= Height then
-          R := round(sqrt(sqr(X - (Width - 1)) + sqr(Y - (Height - 1))))
+          R := Round(Sqrt(Sqr(X - (Width - 1)) + Sqr(Y - (Height - 1))))
         else
           R := X - (Width - 1)
@@ -1631 +1625 @@
   TexWidth, TexHeight: Integer;
 begin
-  // texturize background
+  // Texturize background
   Dest.BeginUpdate;
   TexWidth := Texture.Width;
@@ -1639 +1633 @@
   for Y := 0 to ScaleToNative(Dest.Height) - 1 do begin
     for X := 0 to ScaleToNative(Dest.Width) - 1 do begin
-      if (DstPixel.PixelARGB and $FFFFFF) = TransparentColor then begin
+      if DstPixel.PixelRGB = TransparentColor then begin
         SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
-        DstPixel.PixelB := SrcPixel.PixelB;
-        DstPixel.PixelG := SrcPixel.PixelG;
-        DstPixel.PixelR := SrcPixel.PixelR;
+        DstPixel.PixelRGB := SrcPixel.PixelRGB;
       end;
       DstPixel.NextPixel;

trunk/Packages/DpiControls/Dpi.Graphics.pas

@@ -290 +290 @@
   public
     NativeBitmap: Graphics.TBitmap;
-    procedure BeginUpdate;
-    procedure EndUpdate;
     constructor Create; override;
     destructor Destroy; override;
@@ -337 +335 @@
   published
     procedure LoadFromFile(FileName: string);
-    property Bitmpa: TBitmap read FBitmap write SetBitmap;
+    property Bitmap: TBitmap read FBitmap write SetBitmap;
   end;
 
@@ -713 +711 @@
         DstPixelWidth := ScaleToNative(XX + 1) - ScaleToNative(XX);
         for DstPixelX := 0 to DstPixelWidth - 1 do begin
-          DstPtr.PixelB := SrcPtr.PixelB;
-          DstPtr.PixelG := SrcPtr.PixelG;
-          DstPtr.PixelR := SrcPtr.PixelR;
+          DstPtr.PixelRGB := SrcPtr.PixelRGB;
           DstPtr.NextPixel;
         end;
@@ -819 +815 @@
 end;
 
-procedure TBitmap.BeginUpdate;
-begin
-  GetNativeBitmap.BeginUpdate;
-end;
-
-procedure TBitmap.EndUpdate;
-begin
-  GetNativeBitmap.EndUpdate;
-end;
-
 constructor TBitmap.Create;
 begin

trunk/Packages/DpiControls/DpiControls.lpk

@@ -30 +30 @@
       <Other>
         <CompilerMessages>
-          <IgnoredMessages idx3123="True"/>
+          <IgnoredMessages idx6058="True" idx3123="True"/>
         </CompilerMessages>
       </Other>