Changeset 465 for branches/highdpi/LocalPlayer/TechTree.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (5 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/LocalPlayer/TechTree.pas (modified) (10 diffs)

branches/highdpi/LocalPlayer/TechTree.pas

@@ -30 +30 @@
   end;
 
-var
-  TechTreeDlg: TTechTreeDlg;
-
 
 implementation
@@ -55 +52 @@
   yLegendPitch = 32;
 
-function min(a, b: Integer): Integer;
-begin
-  if a < b then
-    result := a
+function Min(A, B: Integer): Integer;
+begin
+  if A < B then
+    Result := A
   else
-    result := b;
-end;
-
-function max(a, b: Integer): Integer;
-begin
-  if a > b then
-    result := a
+    Result := B;
+end;
+
+function Max(A, B: Integer): Integer;
+begin
+  if A > B then
+    Result := A
   else
-    result := b;
+    Result := B;
 end;
 
@@ -84 +81 @@
 procedure TTechTreeDlg.FormPaint(Sender: TObject);
 var
-  X, w: Integer;
+  X, W: Integer;
 begin
   with Canvas do begin
     // black border
-    brush.color := $000000;
-    fillrect(rect(0, 0, BlackBorder, ClientHeight));
-    fillrect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
-    fillrect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
-    fillrect(rect(BlackBorder, ClientHeight - BlackBorder,
+    Brush.Color := $000000;
+    FillRect(rect(0, 0, BlackBorder, ClientHeight));
+    FillRect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
+    FillRect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
+    FillRect(rect(BlackBorder, ClientHeight - BlackBorder,
       ClientWidth - BlackBorder, ClientHeight));
 
     // texturize empty space
-    brush.color := $FFFFFF;
+    Brush.Color := $FFFFFF;
     if xOffset > 0 then
       FillRectSeamless(Canvas, BlackBorder, BlackBorder, BlackBorder + xOffset,
@@ -105 +102 @@
         ClientWidth - BlackBorder, ClientHeight - BlackBorder,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
-    X := max(BlackBorder, BlackBorder + xOffset);
-    w := min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
+    X := Max(BlackBorder, BlackBorder + xOffset);
+    W := Min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
     if yOffset > 0 then
-      FillRectSeamless(Canvas, X, BlackBorder, w, BlackBorder + yOffset,
+      FillRectSeamless(Canvas, X, BlackBorder, W, BlackBorder + yOffset,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
     if yOffset + Image.height < ClientHeight - 2 * BlackBorder then
-      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, w,
+      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, W,
         ClientHeight - BlackBorder, -BlackBorder - xOffset,
         -BlackBorder - yOffset, Paper);
   end;
-  DpiBitCanvas(Canvas, max(BlackBorder, BlackBorder + xOffset),
-    max(BlackBorder, BlackBorder + yOffset),
-    min(Image.width, min(Image.width + xOffset,
-    min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
-    ), min(Image.height, min(Image.height + yOffset,
-    min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
-    yOffset))), Image.Canvas, max(0, -xOffset),
-    max(0, -yOffset));
+  DpiBitBltCanvas(Canvas, Max(BlackBorder, BlackBorder + xOffset),
+    Max(BlackBorder, BlackBorder + yOffset),
+    Min(Image.width, Min(Image.width + xOffset,
+    Min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
+    ), Min(Image.height, Min(Image.height + yOffset,
+    Min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
+    yOffset))), Image.Canvas, Max(0, -xOffset),
+    Max(0, -yOffset));
 end;
 
@@ -128 +125 @@
 var
   X, Y, ad: Integer;
-  s: string;
+  S: string;
   NewWidth: Integer;
   NewHeight: Integer;
 begin
+  Caption := Phrases2.Lookup('MENU_ADVTREE');
   if Image = nil then begin
     Image := TDpiBitmap.Create;
@@ -139 +137 @@
 
     with Image.Canvas do begin
-      // write advance names
+      // Write advance names
       Font.Assign(UniFont[ftSmall]);
-      Font.color := clBlack;
-      brush.Style := bsClear;
-      for X := 0 to (Image.width - xStart) div xPitch do
-        for Y := 0 to (Image.height - yStart) div yPitch do
+      Font.Color := clBlack;
+      Brush.Style := bsClear;
+      for X := 0 to (Image.Width - xStart) div xPitch do
+        for Y := 0 to (Image.Height - yStart) div yPitch do
         begin
           ad := Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1];
           if ad and $FFFF00 = 0 then
           begin
-            s := Phrases.Lookup('ADVANCES', ad);
-            while TextWidth(s) > 112 do
-              Delete(s, Length(s), 1);
-            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
+            S := Phrases.Lookup('ADVANCES', ad);
+            while TextWidth(S) > 112 do
+              Delete(S, Length(S), 1);
+            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, S);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
               := TransparentColor2;
-          end
+          end;
         end;
 
-      // write legend
+      // Write legend
       TextOut(xLegend, yLegend, Phrases2.Lookup('ADVTREE_UP0'));
       TextOut(xLegend, yLegend + yLegendPitch, Phrases2.Lookup('ADVTREE_UP1'));
@@ -172 +170 @@
   end;
 
-  // fit window to image, center image in window, center window to screen
+  // Fit window to image, center image in window, center window to screen
   NewWidth := Min(DpiScreen.Width - 40, Image.Width + LeftBorder + RightBorder + 2 * BlackBorder);
   NewHeight := Min(DpiScreen.Height - 40, Image.Height + TopBorder + BottomBorder + 2 * BlackBorder);
@@ -190 +188 @@
   if Button = mbLeft then
   begin
-    dragging := true;
+    Dragging := True;
     xDown := X;
     yDown := Y;
@@ -199 +197 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  dragging := false;
+  Dragging := False;
 end;
 
@@ -205 +203 @@
   X, Y: Integer);
 begin
-  if dragging then
+  if Dragging then
   begin
     xOffset := xOffset + X - xDown;