Changeset 473 for trunk/LocalPlayer/Select.pas

Timestamp:

Dec 4, 2023, 12:13:15 PM (12 months ago)

Author:

chronos

Message:

• Added: Custom DPI configuration in Settings dialog.
• Fixed: Better High DPI support.

File:

• trunk/LocalPlayer/Select.pas (modified) (11 diffs)

trunk/LocalPlayer/Select.pas

@@ -180 +180 @@
   if S <> '' then
     LoweredTextOut(Canvas, -1, MainTexture,
-      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, 31, S);
+      (Width - BiColorTextWidth(Canvas, S)) div 2, 31, S);
   if not MultiPage and (Kind in [kProject, kAdvance, kFarAdvance]) and not Phrases2FallenBackToEnglish
   then
@@ -186 +186 @@
     S := Phrases2.Lookup('SHIFTCLICK');
     LoweredTextOut(Canvas, -2, MainTexture,
-      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, ClientHeight - 29, S);
+      (Width - BiColorTextWidth(Canvas, S)) div 2, Height - 29, S);
   end;
 end;
@@ -231 +231 @@
       if Y + TextSize.cy >= TitleHeight + InnerHeight then
         TextSize.cy := TitleHeight + InnerHeight - Y;
-      Fill(ca, X, Y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
-        div 2, (Maintexture.Height - ClientHeight) div 2);
+      Fill(ca, X, Y, TextSize.cx, TextSize.cy, (Maintexture.Width - Width)
+        div 2, (Maintexture.Height - Height) div 2);
     end;
     LoweredTextOut(ca, Color, MainTexture, X, Y, S);
@@ -811 +811 @@
     if ScienceNation <> OldScienceNation then
     begin
-      Fill(Canvas, 9, ClientHeight - 29, ClientWidth - 18, 24,
-        (Maintexture.Width - ClientWidth) div 2,
-        (Maintexture.Height - ClientHeight) div 2);
+      Fill(Canvas, 9, Height - 29, Width - 18, 24,
+        (Maintexture.Width - Width) div 2,
+        (Maintexture.Height - Height) div 2);
       if ScienceNation >= 0 then
       begin
@@ -823 +823 @@
           S := S + ' (' + TurnToString(MyRO.EnemyReport[ScienceNation]
             .TurnOfCivilReport) + ')'; // old report
-        xScreen := (ClientWidth - BiColorTextWidth(Canvas, S)) div 2;
+        xScreen := (Width - BiColorTextWidth(Canvas, S)) div 2;
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
-          ClientHeight - 29, S);
+          Height - 29, S);
         BitBltCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
-          ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
+          ScienceNationDot.Height, Canvas, xScreen - 10, Height - 27);
         ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0),
           ScienceNationDot.BoundsRect, MainTexture.ColorBevelShade, Tribe[ScienceNation].Color);
-        BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
+        BitBltCanvas(Canvas, xScreen - 10, Height - 27, ScienceNationDot.Width,
           ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0);
       end;
@@ -1577 +1577 @@
       DispLines := MaxLines;
     InnerHeight := LineDistance * (DispLines + 1) + 24;
-    ClientHeight := InnerHeight + TitleHeight + WideFrame;
+    Height := InnerHeight + TitleHeight + WideFrame;
   end
   else
@@ -1584 +1584 @@
       DispLines := MaxLines;
     InnerHeight := LineDistance * (DispLines + 1) + 24;
-    ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
-  end;
-  Assert(ClientHeight <= Maintexture.Height);
+    Height := InnerHeight + TitleHeight + NarrowFrame;
+  end;
+  Assert(Height <= Maintexture.Height);
 
   TechNameSpace := 224;
@@ -1618 +1618 @@
     InnerWidth := 363;
   end;
-  ClientWidth := InnerWidth + 2 * SideFrame;
-
-  CloseBtn.Left := ClientWidth - 38;
+  Width := InnerWidth + 2 * SideFrame;
+
+  CloseBtn.Left := Width - 38;
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
   CaptionRight := CloseBtn.Left;
@@ -1645 +1645 @@
   if Kind = kProject then
   begin
-    Layer0Btn.Top := ClientHeight - 31;
-    Layer0Btn.Left := ClientWidth div 2 - (12 + 29);
+    Layer0Btn.Top := Height - 31;
+    Layer0Btn.Left := Width div 2 - (12 + 29);
     Layer0Btn.Down := True;
-    Layer1Btn.Top := ClientHeight - 31;
-    Layer1Btn.Left := ClientWidth div 2 - (12 - 29);
+    Layer1Btn.Top := Height - 31;
+    Layer1Btn.Left := Width div 2 - (12 - 29);
     Layer1Btn.Down := False;
-    Layer2Btn.Top := ClientHeight - 31;
-    Layer2Btn.Left := ClientWidth div 2 - 12;
+    Layer2Btn.Top := Height - 31;
+    Layer2Btn.Left := Width div 2 - 12;
     Layer2Btn.Down := False;
   end;
@@ -1667 +1667 @@
 var
   I: Integer;
-  ShowFocus, forceclose: Boolean;
-begin
-  forceclose := (ListKind <> Kind) and
+  ShowFocus, ForceClose: Boolean;
+begin
+  ForceClose := (ListKind <> Kind) and
     not((Kind = kCities) and (ListKind = kCityEvents)) and
     not((Kind = kCityEvents) and (ListKind = kCities)) and
@@ -1746 +1746 @@
   CloseBtn.Visible := not(Kind in MustChooseKind);
 
-  inherited ShowNewContent(NewMode, forceclose);
+  inherited ShowNewContent(NewMode, ForceClose);
 end;