Changeset 465 for branches/highdpi/LocalPlayer/Rates.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/Rates.pas (modified) (11 diffs)

branches/highdpi/LocalPlayer/Rates.pas

@@ -5 +5 @@
 
 uses
-  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
-
-  SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC;
+  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, ButtonC;
 
 type
@@ -23 +21 @@
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer);
-  end;
-
-var
-  RatesDlg: TRatesDlg;
+    procedure ShowNewContent(NewMode: TWindowMode);
+  end;
+
 
 implementation
@@ -47 +43 @@
 procedure TRatesDlg.OffscreenPaint;
 var
-  p, x, y, current, max, i: integer;
-  s, s1: string;
+  P, X, Y, current, Max, I: Integer;
+  S, s1: string;
 begin
   if (OffscreenUser <> nil) and (OffscreenUser <> self) then
@@ -65 +61 @@
   BtnFrame(Offscreen.Canvas, CloseBtn.BoundsRect, MainTexture);
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  s := Phrases.Lookup('TITLE_RATES');
+  S := Phrases.Lookup('TITLE_RATES');
   RisedTextOut(Offscreen.Canvas,
-    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s)) div 2 - 1, 7, s);
-
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
-    s := Phrases.Lookup('NORATES')
-  else
-    s := Phrases.Lookup('RATES');
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2 - 1, 7, S);
+
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
+    S := Phrases.Lookup('NORATES')
+  else
+    S := Phrases.Lookup('RATES');
   Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-  p := pos('\', s);
-  if p = 0 then
-    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
-      div 2, 114, s)
-  else
-  begin
-    s1 := copy(s, 1, p - 1);
+  P := Pos('\', S);
+  if P = 0 then
+    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
+      div 2, 114, S)
+  else
+  begin
+    s1 := Copy(S, 1, P - 1);
     RisedTextOut(Offscreen.Canvas,
       (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
       114 - MessageLineSpacing div 2, s1);
-    s1 := copy(s, p + 1, 255);
+    s1 := Copy(S, P + 1, 255);
     RisedTextOut(Offscreen.Canvas,
       (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
@@ -91 +87 @@
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
   begin
     GlowFrame(Offscreen, ClientWidth div 2 - xSizeBig div 2, 52, xSizeBig,
-      ySizeBig, Tribe[me].Color);
-    DpiBitCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
+      ySizeBig, Tribe[Me].Color);
+    DpiBitBltCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
       xSizeBig, ySizeBig, BigImp.Canvas, (woLiberty mod 7) * xSizeBig,
       (woLiberty div 7 + SystemIconLines) * ySizeBig);
@@ -103 +99 @@
     // ImageOp_CBC(Offscreen,Templates,260,40,145,112,36,36,$404000,$8B8BEB);
 
-    s := Phrases.Lookup('SCIENCE');
-    RisedTextOut(Offscreen.Canvas,
-      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 44, s);
-    s := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
-    RisedTextOut(Offscreen.Canvas,
-      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 60, s);
+    S := Phrases.Lookup('SCIENCE');
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, S), 44, S);
+    S := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, S), 60, S);
     // PaintProgressBar(Offscreen.Canvas,2,16,81,(100-MyRO.LuxRate-MyRO.TaxRate)*120 div 100,0,120,MainTexture);
 
     // reverse progress bar for science
-    x := 16;
-    y := 81;
+    X := 16;
+    Y := 81;
     current := (100 - MyRO.LuxRate - MyRO.TaxRate) * 120 div 100;
-    max := 120;
-    Frame(Offscreen.Canvas, x - 1, y - 1, x + max, y + 7, $000000, $000000);
-    RFrame(Offscreen.Canvas, x - 2, y - 2, x + max + 1, y + 8,
+    Max := 120;
+    Frame(Offscreen.Canvas, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
+    RFrame(Offscreen.Canvas, X - 2, Y - 2, X + Max + 1, Y + 8,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     with Offscreen.Canvas do
     begin
-      for i := 0 to current div 8 - 1 do
-        DpiBitCanvas(Offscreen.Canvas, x + max - 8 - i * 8, y, 8, 7,
+      for I := 0 to current div 8 - 1 do
+        DpiBitBltCanvas(Offscreen.Canvas, X + Max - 8 - I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
-      DpiBitCanvas(Offscreen.Canvas, x + max - current, y, current - 8 * (current div 8), 7,
+      DpiBitBltCanvas(Offscreen.Canvas, X + Max - current, Y, current - 8 * (current div 8), 7,
         HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
       Brush.Color := $000000;
-      FillRect(Rect(x, y, x + max - current, y + 7));
+      FillRect(Rect(X, Y, X + Max - current, Y + 7));
       Brush.Style := bsClear;
     end;
 
     RisedTextOut(Offscreen.Canvas, 16 + 160, 44, Phrases.Lookup('LUX'));
-    s := Format('%d%%', [MyRO.LuxRate]);
-    RisedTextOut(Offscreen.Canvas,
-      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, s);
+    S := Format('%d%%', [MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, S);
     PaintProgressBar(Offscreen.Canvas, 5, 16 + 160, 81,
       MyRO.LuxRate * 120 div 100, 0, 120, MainTexture);
@@ -145 +141 @@
     MainTexture.ColorBevelLight);
   RisedTextOut(Offscreen.Canvas, 16 + 80, 164, Phrases.Lookup('TAXRATE'));
-  s := Format('%d%%', [MyRO.TaxRate]);
+  S := Format('%d%%', [MyRO.TaxRate]);
   RisedTextOut(Offscreen.Canvas,
-    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, s);
+    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, S);
   PaintProgressBar(Offscreen.Canvas, 0, 16 + 80, 201,
     MyRO.TaxRate * 120 div 100, 0, 120, MainTexture);
@@ -157 +153 @@
 end;
 
-procedure TRatesDlg.ShowNewContent(NewMode: integer);
+procedure TRatesDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -164 +160 @@
 procedure TRatesDlg.FormShow(Sender: TObject);
 begin
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
-  begin
-    ScienceBtn.Visible := false;
-    LuxBtn.Visible := false;
+  Caption := Phrases.Lookup('TITLE_RATES');
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
+  begin
+    ScienceBtn.Visible := False;
+    LuxBtn.Visible := False;
   end
   else
   begin
-    ScienceBtn.Visible := true;
-    LuxBtn.Visible := true;
+    ScienceBtn.Visible := True;
+    LuxBtn.Visible := True;
   end;
   OffscreenPaint;
@@ -184 +181 @@
 procedure TRatesDlg.TaxLuxBtnClick(Sender: TObject);
 var
-  NewTax, NewLux: integer;
+  NewTax, NewLux: Integer;
 begin
   NewTax := MyRO.TaxRate div 10;
@@ -191 +188 @@
   begin
     if NewTax < 10 then
-      inc(NewTax);
+      Inc(NewTax);
     if NewTax + NewLux > 10 then
-      dec(NewLux);
+      Dec(NewLux);
   end
   else if (Sender = TaxDownBtn) and (NewTax > 0) then
-    dec(NewTax)
+    Dec(NewTax)
   else if (Sender = ScienceBtn) and (NewLux > 0) then
-    dec(NewLux)
+    Dec(NewLux)
   else if (Sender = LuxBtn) and (NewLux + NewTax < 100) then
-    inc(NewLux);
-  if Server(sSetRates, me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
+    Inc(NewLux);
+  if Server(sSetRates, Me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
   begin
     CityOptimizer_BeginOfTurn;
     SmartUpdateContent;
-    MainScreen.UpdateViews(true);
+    MainScreen.UpdateViews(True);
   end;
 end;