Changeset 468 for trunk/LocalPlayer/Term.pas

Timestamp:

Dec 3, 2023, 11:28:08 AM (5 months ago)

Author:

chronos

Message:

• Added: High DPI support integrated into trunk branch. It can be enabled by adding DPI define to compiler parameters for main project and packages.

File:

• trunk/LocalPlayer/Term.pas (modified) (22 diffs)

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
-  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
+  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, System.UITypes,
+  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
   Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
-  Help;
+  Help,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus, Dpi.ExtCtrls,
+  Dpi.PixelPointer, Dpi.Common{$ELSE}
+  Graphics, Controls, Forms, Menus, ExtCtrls, PixelPointer{$ENDIF};
 
 const
@@ -642 +645 @@
 
 uses
-  Directories, Log, PixelPointer, Sound, Registry, Global, KeyBindings, CmdList;
+  Directories, Log, Sound, Registry, Global, KeyBindings, CmdList;
 
 {$R *.lfm}
@@ -1809 +1812 @@
   HGrStdUnits := LoadGraphicSet('StdUnits.png');
   SmallImp := TBitmap.Create;
-  SmallImp.PixelFormat := pf24bit;
+  SmallImp.PixelFormat := TPixelFormat.pf24bit;
   InitSmallImp;
   SoundPreloadDone := [];
@@ -1869 +1872 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, Panel.width, Panel.height));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
     with TopBar.Canvas do
@@ -1875 +1878 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, TopBar.width, TopBar.height));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
     Invalidate;
@@ -2885 +2888 @@
           Brush.Color := $000000;
           FillRect(Rect(0, 0, Panel.width, Panel.height));
-          Brush.Style := bsClear;
+          Brush.Style := TBrushStyle.bsClear;
         end;
         with TopBar.Canvas do
@@ -2891 +2894 @@
           Brush.Color := $000000;
           FillRect(Rect(0, 0, TopBar.width, TopBar.height));
-          Brush.Style := bsClear;
+          Brush.Style := TBrushStyle.bsClear;
         end;
         FormResize(nil); // place mini map correctly according to its size
@@ -3634 +3637 @@
   MiniMap := TMiniMap.Create;
   Panel := TBitmap.Create;
-  Panel.PixelFormat := pf24bit;
+  Panel.PixelFormat := TPixelFormat.pf24bit;
   Panel.Canvas.Font.Assign(UniFont[ftSmall]);
-  Panel.Canvas.Brush.Style := bsClear;
+  Panel.Canvas.Brush.Style := TBrushStyle.bsClear;
   TopBar := TBitmap.Create;
-  TopBar.PixelFormat := pf24bit;
+  TopBar.PixelFormat := TPixelFormat.pf24bit;
   TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
-  TopBar.Canvas.Brush.Style := bsClear;
+  TopBar.Canvas.Brush.Style := TBrushStyle.bsClear;
   Buffer := TBitmap.Create;
-  Buffer.PixelFormat := pf24bit;
+  Buffer.PixelFormat := TPixelFormat.pf24bit;
   if 2 * lxmax > 3 * xSizeBig then Buffer.width := 2 * lxmax
     else Buffer.width := 3 * xSizeBig;
@@ -4806 +4809 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, MapWidth, MapHeight));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
       OffscreenUser := self;
       Exit;
@@ -4991 +4994 @@
       xRightPanel + 2, PanelHeight, ClientWidth div 2);
 
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
     Pen.Color := $000000;
     MoveTo(0, 0);
@@ -5216 +5219 @@
     else if TroopLoc >= 0 then
     begin
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
       if UnFocus >= 0 then
         with MyUn^[UnFocus] do
@@ -5709 +5712 @@
 begin
   if Idle and (Me >= 0) and (GameMode <> cMovie) then
-    if (fsModal in Screen.ActiveForm.FormState) or
+    if (TFormStateType.fsModal in Screen.ActiveForm.FormState) or
       (Screen.ActiveForm is TBufferedDrawDlg) and
       (TBufferedDrawDlg(Screen.ActiveForm).WindowMode <> wmPersistent) then
@@ -5865 +5868 @@
   if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
     Exit;
-  if (Button = mbLeft) and not(ssShift in Shift) then
+  if (Button = TMouseButton.mbLeft) and not(ssShift in Shift) then
   begin
     DoCenter := True;
@@ -5992 +5995 @@
     end;
   end
-  else if (ClientMode <> cEditMap) and (Button = mbRight) and
+  else if (ClientMode <> cEditMap) and (Button = TMouseButton.mbRight) and
     not(ssShift in Shift) then
   begin
@@ -6075 +6078 @@
       end;
   end
-  else if (Button = mbMiddle) and (UnFocus >= 0) and
+  else if (Button = TMouseButton.mbMiddle) and (UnFocus >= 0) and
     (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler, mkSlaves]) then
   begin
@@ -6088 +6091 @@
       mEnhance.Click;
   end
-  else if (Button = mbLeft) and (ssShift in Shift) and
+  else if (Button = TMouseButton.mbLeft) and (ssShift in Shift) and
     (MyMap[MouseLoc] and fTerrain <> fUNKNOWN) then
     HelpOnTerrain(MouseLoc, wmPersistent)
-  else if (ClientMode <= cContinue) and (Button = mbRight) and
+  else if (ClientMode <= cContinue) and (Button = TMouseButton.mbRight) and
     (ssShift in Shift) and (UnFocus >= 0) and
     (MyMap[MouseLoc] and (fUnit or fOwned) = fUnit) then
@@ -6867 +6870 @@
     Exit;
 
-  if Button = mbLeft then
+  if Button = TMouseButton.mbLeft then
   begin
     if (X >= xMini + 2) and (Y >= yMini + 2) and (X < xMini + 2 + 2 * G.lx) and
@@ -7160 +7163 @@
 procedure TMainScreen.SetFullScreen(Active: Boolean);
 begin
-    if Active and (CurrentWindowState <> wsFullScreen) then begin
+    if Active and (CurrentWindowState <> TWindowState.wsFullScreen) then begin
       PrevWindowState := WindowState;
-      CurrentWindowState := wsFullScreen;
+      CurrentWindowState := TWindowState.wsFullScreen;
       WindowState := CurrentWindowState;
       {$IFDEF WINDOWS}
@@ -7169 +7172 @@
       BorderIcons := [];
     end else
-    if not Active and (CurrentWindowState = wsFullScreen) then begin
-      if PrevWindowState = wsMaximized then begin
-        CurrentWindowState := wsMaximized;
+    if not Active and (CurrentWindowState = TWindowState.wsFullScreen) then begin
+      if PrevWindowState = TWindowState.wsMaximized then begin
+        CurrentWindowState := TWindowState.wsMaximized;
         WindowState := CurrentWindowState;
       end else begin
-        CurrentWindowState := wsNormal;
+        CurrentWindowState := TWindowState.wsNormal;
         WindowState := CurrentWindowState;
-        WindowState := wsFullScreen;
+        WindowState := TWindowState.wsFullScreen;
         WindowState := CurrentWindowState;
       end;
@@ -7182 +7185 @@
       BorderStyle := bsSizeable;
       {$ENDIF}
-      BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+      BorderIcons := [TBorderIcon.biSystemMenu, TBorderIcon.biMinimize,
+        TBorderIcon.biMaximize];
     end;
 end;
@@ -7954 +7958 @@
     MouseLoc := LocationOfScreenPixel(X, Y);
     if MouseLoc <> BrushLoc then
-      MapBoxMouseDown(nil, mbLeft, Shift, X, Y);
+      MapBoxMouseDown(nil, TMouseButton.mbLeft, Shift, X, Y);
   end
   (* else if Idle and (UnFocus>=0) then
@@ -8067 +8071 @@
           TopBarHeight + MapHeight - overlap));
       end;
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
   BitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,