Changeset 246 for branches/highdpi/Start.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• branches/highdpi/Start.pas (modified) (6 diffs)

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;