Changeset 361 for branches/highdpi/LocalPlayer/Select.pas

Timestamp:

Apr 9, 2021, 5:56:50 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r360 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/Select.pas (modified) (17 diffs)

branches/highdpi/LocalPlayer/Select.pas

@@ -112 +112 @@
   Canvas.Font.Assign(UniFont[ftNormal]);
   sb := TPVScrollbar.Create(Self);
+  sb.SetBorderSpacing(36, 10, 36);
   sb.OnUpdate := ScrollBarUpdate;
-  InitButtons();
+  InitButtons;
   Kind := kMission;
   Layer0Btn.Hint := Phrases.Lookup('BTN_IMPRS');
@@ -201 +202 @@
     begin
       Frame(offscreen.Canvas, x + (16 - 1), y + (16 - 2), x + (16 + xSizeSmall),
-        y + (16 - 1 + ySizeSmall), MainTexture.clBevelLight,
-        MainTexture.clBevelShade);
+        y + (16 - 1 + ySizeSmall), MainTexture.ColorBevelLight,
+        MainTexture.ColorBevelShade);
       if pix and cpType = 0 then
         if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
@@ -230 +231 @@
       if y + TextSize.cy >= TitleHeight + InnerHeight then
         TextSize.cy := TitleHeight + InnerHeight - y;
-      Fill(ca, x, y, TextSize.cx, TextSize.cy, (wMaintexture - ClientWidth)
-        div 2, (hMaintexture - ClientHeight) div 2);
+      Fill(ca, x, y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
+        div 2, (Maintexture.Height - ClientHeight) div 2);
     end;
     LoweredTextOut(ca, Color, MainTexture, x, y, s);
@@ -259 +260 @@
       begin
         x := x + SideFrame;
-        y := y + TitleHeight
+        y := y + TitleHeight;
       end;
       if lit then
-        TextColor := MainTexture.clLitText
+        TextColor := MainTexture.ColorLitText
       else
         TextColor := -1;
@@ -433 +434 @@
     end;
     if lit then
-      TextColor := MainTexture.clLitText
+      TextColor := MainTexture.ColorLitText
     else
       TextColor := -1;
@@ -555 +556 @@
               begin
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
-                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
               end
@@ -561 +562 @@
               begin
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
-                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
               end
@@ -567 +568 @@
               begin
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
-                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
               end
@@ -574 +575 @@
                 Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1,
                   (8 + 16 + xSizeSmall), y0 + ySizeSmall,
-                  MainTexture.clBevelLight, MainTexture.clBevelShade);
+                  MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 if AdvIcon[lix] < 84 then
                   DpiBitCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
@@ -680 +681 @@
             Frame(offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
               8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
-              MainTexture.clBevelLight, MainTexture.clBevelShade);
+              MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
             DpiBitCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
               xSizeSmall, ySizeSmall, SmallImp.Canvas,
@@ -711 +712 @@
     end;
     if lit then
-      TextColor := MainTexture.clLitText
+      TextColor := MainTexture.ColorLitText
     else
       TextColor := -1;
@@ -811 +812 @@
     begin
       Fill(Canvas, 9, ClientHeight - 29, ClientWidth - 18, 24,
-        (wMaintexture - ClientWidth) div 2,
-        (hMaintexture - ClientHeight) div 2);
+        (Maintexture.Width - ClientWidth) div 2,
+        (Maintexture.Height - ClientHeight) div 2);
       if ScienceNation >= 0 then
       begin
@@ -828 +829 @@
           ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
         ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0),
-          ScienceNationDot.BoundsRect, MainTexture.clBevelShade, Tribe[ScienceNation].Color);
+          ScienceNationDot.BoundsRect, MainTexture.ColorBevelShade, Tribe[ScienceNation].Color);
         DpiBitCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
           ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0);
@@ -1531 +1532 @@
   begin
     LineDistance := 21; // looks ugly with scrollbar
-    MaxLines := (hMaintexture - (24 + TitleHeight + NarrowFrame))
+    MaxLines := (Maintexture.Height - (24 + TitleHeight + NarrowFrame))
       div LineDistance - 1;
   end
@@ -1537 +1538 @@
   begin
     LineDistance := 24;
-    MaxLines := (hMaintexture - (24 + TitleHeight + WideFrame))
+    MaxLines := (Maintexture.Height - (24 + TitleHeight + WideFrame))
       div LineDistance - 1;
   end;
@@ -1551 +1552 @@
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) or (Kind = kModels) or
     (Kind = kEModels) then begin
+    sb.SetBorderSpacing(56, 10, 10);
     TitleHeight := WideFrame + 20;
-    sb.SetBorderSpacing(56, 10, 10);
   end else begin
+    sb.SetBorderSpacing(36, 10, 34);
     TitleHeight := WideFrame;
-    sb.SetBorderSpacing(36, 10, 34);
   end;
 
@@ -1576 +1577 @@
     ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
   end;
-  assert(ClientHeight <= hMaintexture);
+  assert(ClientHeight <= Maintexture.Height);
 
   TechNameSpace := 224;