Changeset 361 for branches/highdpi/LocalPlayer/Draft.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/Draft.pas (modified) (8 diffs)

branches/highdpi/LocalPlayer/Draft.pas

@@ -68 +68 @@
 begin
   inherited;
-  InitButtons();
+  InitButtons;
   HelpContext := 'CLASSES';
   Caption := Phrases.Lookup('TITLE_DRAFT');
@@ -183 +183 @@
         Phrases.Lookup('UNITSPEED'));
       DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
-        MainTexture.clBevelShade, MainTexture.clBevelLight);
+        MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
       DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
-        MainTexture.clBevelShade, MainTexture.clBevelLight);
+        MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
       s := MovementToString(MyRO.DevModel.Speed);
       RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
@@ -199 +199 @@
         xTotal2 + 148 + 30, y, '=');
       DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
-        MainTexture.clBevelShade, MainTexture.clBevelLight);
+        MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
       DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
-        MainTexture.clBevelShade, MainTexture.clBevelLight);
+        MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
       s := IntToStr(MyRO.DevModel.Cost);
       RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
@@ -216 +216 @@
           xTotal2 + 148 + 30, y, '=');
         DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
-          MainTexture.clBevelShade, MainTexture.clBevelLight);
+          MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
         DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
-          MainTexture.clBevelShade, MainTexture.clBevelLight);
+          MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
         s := IntToStr(MyRO.DevModel.Cost * BuildCostMod
           [G.Difficulty[me]] div 12);
@@ -236 +236 @@
 
   ClientHeight := Template.Height - Cut;
-  if ClientHeight > hMainTexture then
+  if ClientHeight > MainTexture.Height then
   // assemble background from 2 texture tiles
   begin
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
-      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
-      hMainTexture - 64);
+      MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
+      MainTexture.Height - 64);
     DpiBitCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
-      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
       0);
   end
   else
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
-      (hMainTexture - ClientHeight) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
+      (MainTexture.Height - ClientHeight) div 2);
   ImageOp_B(Back, Template, 0, 0, 0, 0, Template.Width, 64);
   ImageOp_B(Back, Template, 0, 64, 0, 64 + Cut, Template.Width,
@@ -320 +320 @@
             RFrame(offscreen.Canvas, xFeature - (21 + 1),
               yFeature + 2 + LinePitch * i - 1, xFeature - (21 - 24),
-              yFeature + 2 + LinePitch * i + 12, MainTexture.clBevelShade,
-              MainTexture.clBevelLight);
+              yFeature + 2 + LinePitch * i + 12, MainTexture.ColorBevelShade,
+              MainTexture.ColorBevelLight);
           end
           else
@@ -329 +329 @@
             RFrame(offscreen.Canvas, xFeature - (9 + 1),
               yFeature + 2 + LinePitch * i - 1, xFeature - (21 - 24),
-              yFeature + 2 + LinePitch * i + 12, MainTexture.clBevelShade,
-              MainTexture.clBevelLight);
+              yFeature + 2 + LinePitch * i + 12, MainTexture.ColorBevelShade,
+              MainTexture.ColorBevelLight);
           end;
 
@@ -362 +362 @@
 
         if MyRO.DevModel.Cap[code[i]] > 0 then
-          TextColor := MainTexture.clLitText
+          TextColor := MainTexture.ColorLitText
         else
           TextColor := -1;