Changeset 249 for branches

Timestamp:

May 22, 2020, 9:09:55 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Incorrect drawing of start screen ornament.

Location:

branches/highdpi/Packages/CevoComponents

Files:

• ScreenTools.pas (modified) (2 diffs)
• UPixelPointer.pas (modified) (2 diffs)

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -980 +980 @@
 procedure InitOrnament;
 var
-  x, y, p, Light, Shade: Integer;
+  P: TColor;
+  X, Y, Light, Shade: Integer;
+  PixelPtr: TPixelPointer;
 begin
   if InitOrnamentDone then Exit;
@@ -987 +989 @@
   Shade := MainTexture.clBevelShade and $FCFCFC shr 2 * 3 +
     MainTexture.clBevelLight and $FCFCFC shr 2;
-  for x := 0 to wOrna - 1 do
-    for y := 0 to hOrna - 1 do begin
-      p := GrExt[HGrSystem2].Data.Canvas.Pixels[xOrna + x, yOrna + y];
-      if p = $0000FF then
-        GrExt[HGrSystem2].Data.Canvas.Pixels[xOrna + x, yOrna + y] := Light
-      else if p = $FF0000 then
-        GrExt[HGrSystem2].Data.Canvas.Pixels[xOrna + x, yOrna + y] := Shade;
-    end;
+  GrExt[HGrSystem2].Data.BeginUpdate;
+  PixelPtr := PixelPointer(GrExt[HGrSystem2].Data, ScaleToNative(xOrna), ScaleToNative(yOrna));
+  for Y := 0 to ScaleToNative(hOrna) - 1 do begin
+    for X := 0 to ScaleToNative(wOrna) - 1 do begin
+      P := Color32ToColor(PixelPtr.Pixel^.ARGB);
+      if P = $0000FF then PixelPtr.Pixel^.ARGB := ColorToColor32(Light)
+      else if P = $FF0000 then PixelPtr.Pixel^.ARGB := ColorToColor32(Shade);
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
   InitOrnamentDone := True;
+  GrExt[HGrSystem2].Data.EndUpdate;
 end;
 

branches/highdpi/Packages/CevoComponents/UPixelPointer.pas

@@ -37 +37 @@
 
   function PixelPointer(Bitmap: TDpiRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
+  function Color32ToColor(Color: TColor32): TColor;
+  function ColorToColor32(Color: TColor): TColor32;
 
 
@@ -86 +88 @@
 end;
 
+function Color32ToColor(Color: TColor32): TColor;
+begin
+  Result := ((Color shr 16) and $ff) or (Color and $00ff00) or
+    ((Color and $ff) shl 16);
+end;
+
+function ColorToColor32(Color: TColor): TColor32;
+begin
+  Result := $ff000000 or ((Color shr 16) and $ff) or (Color and $00ff00) or
+    ((Color and $ff) shl 16);
+end;
+
 
 end.