Changeset 471

Timestamp:

Dec 4, 2023, 12:08:50 AM (5 months ago)

Author:

chronos

Message:

• Fixed: More units uses items corrected for high DPI support.

Location:

trunk

Files:

• Inp.pas (modified) (1 diff)
• Integrated.lpr (modified) (1 diff)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Messg.pas (modified) (1 diff)
• MiniMap.pas (modified) (1 diff)
• NoTerm.pas (modified) (1 diff)
• Packages/CevoComponents/Area.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonA.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonB.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonBase.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonN.pas (modified) (1 diff)
• Packages/CevoComponents/DrawDlg.pas (modified) (3 diffs)
• Packages/CevoComponents/EOTButton.pas (modified) (1 diff)
• Packages/CevoComponents/GraphicSet.pas (modified) (1 diff)
• Packages/CevoComponents/Texture.pas (modified) (1 diff)
• Packages/DpiControls/Dpi.Controls.pas (modified) (1 diff)
• Settings.pas (modified) (1 diff)
• Start.pas (modified) (1 diff)

trunk/Inp.pas

@@ -6 +6 @@
 uses
   ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, ButtonA, StdCtrls,
-  System.UITypes,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
   Graphics, Controls, Forms{$ENDIF};
 

trunk/Integrated.lpr

@@ -6 +6 @@
   cthreads, clocale,
   {$ENDIF}
-  {$IFDEF DPI}Dpi.Forms,{$ELSE}Forms,{$ENDIF}
   Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
   Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
-  NoTerm, ScreenTools, Directories;
+  NoTerm, ScreenTools, Directories,
+  {$IFDEF DPI}Dpi.Forms{$ELSE}Forms{$ENDIF};
 
 {$if declared(UseHeapTrace)}

trunk/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType, UITypes,
+  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
   SysUtils, Classes, DrawDlg, IsoEngine,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
   Graphics, Controls, Forms{$ENDIF};
 

trunk/LocalPlayer/CityScreen.pas

@@ -8 +8 @@
   Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
   Messages, SysUtils, Classes, ButtonA, ButtonC, Area, GraphType, Texture,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, System.UITypes{$ELSE}
   Graphics, Controls, Forms, ExtCtrls{$ENDIF};
 

trunk/LocalPlayer/Draft.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
-  Classes, ButtonA, ButtonB, Area, System.UITypes,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
+  Classes, ButtonA, ButtonB, Area,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls,
+  System.UITypes{$ELSE}
   Graphics, Controls, Forms, ExtCtrls{$ENDIF};
 

trunk/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType, System.UITypes,
+  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
   Messages, SysUtils, Classes, ButtonB, PVSB, Types, Generics.Collections, IsoEngine,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Common{$ELSE}
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Common,
+  System.UITypes{$ELSE}
   Graphics, Controls, Forms, ExtCtrls{$ENDIF};
 

trunk/LocalPlayer/MessgEx.pas

@@ -6 +6 @@
 uses
   Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
-  SysUtils, Classes, ButtonA, ButtonB, DrawDlg, Help, System.UITypes,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Common{$ELSE}
+  SysUtils, Classes, ButtonA, ButtonB, DrawDlg, Help,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Common,
+  System.UITypes{$ELSE}
   Graphics, Controls, Forms, StdCtrls{$ENDIF};
 

trunk/LocalPlayer/Nego.pas

@@ -6 +6 @@
 uses
   ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, ButtonA, ButtonB,
-  ButtonN, System.UITypes,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  ButtonN,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
   Graphics, Controls, Forms{$ENDIF};
 

trunk/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, ScreenTools, PVSB, BaseWin, System.UITypes,
-  LCLIntf, LCLType, Messages, SysUtils, Classes, ButtonB, ButtonBase, Types,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus{$ELSE}
+  Protocol, ClientTools, ScreenTools, PVSB, BaseWin, LCLIntf, LCLType, Messages,
+  SysUtils, Classes, ButtonB, ButtonBase, Types,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus,
+  System.UITypes{$ELSE}
   Graphics, Controls, Forms, ExtCtrls, Menus{$ENDIF};
 

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
-  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, System.UITypes,
+  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types,
   DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
@@ -18 +18 @@
   Help,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus, Dpi.ExtCtrls,
-  Dpi.PixelPointer, Dpi.Common{$ELSE}
+  Dpi.PixelPointer, Dpi.Common, System.UITypes{$ELSE}
   Graphics, Controls, Forms, Menus, ExtCtrls, PixelPointer{$ENDIF};
 

trunk/Messg.pas

@@ -6 +6 @@
 uses
   ScreenTools, LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes,
-  ButtonA, DrawDlg, System.UITypes,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  ButtonA, DrawDlg,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
   Graphics, Controls, Forms{$ENDIF};
 

trunk/MiniMap.pas

@@ -21 +21 @@
     Bitmap: TBitmap; { game world sample preview }
     Size: TPoint;
-    Colors: array [0 .. 11, 0 .. 1] of TColor;
+    Colors: array [0..31, 0..1] of TColor;
     Mode: TMiniMode;
     MapOptions: TMapOptions;

trunk/NoTerm.pas

@@ -6 +6 @@
 uses
   ScreenTools, Protocol, Messg, LCLIntf, LCLType, DateUtils, Platform,
-  SysUtils, Classes, ButtonB, DrawDlg, System.UITypes,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  SysUtils, Classes, ButtonB, DrawDlg,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
   Graphics, Controls, Forms{$ENDIF};
 

trunk/Packages/CevoComponents/Area.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}
-  Graphics, Controls,{$ENDIF}
-  Classes;
+  Classes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls{$ELSE}
+  Graphics, Controls{$ENDIF};
 
 type

trunk/Packages/CevoComponents/BaseWin.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms,{$ELSE}
-  Graphics, Controls, Forms,{$ENDIF}
-  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, System.UITypes;
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type

trunk/Packages/CevoComponents/ButtonA.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
-  ButtonBase, Classes, LCLIntf, LCLType, ScreenTools, Types;
+  ButtonBase, Classes, LCLIntf, LCLType, ScreenTools, Types,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
 type

trunk/Packages/CevoComponents/ButtonB.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
-  ButtonBase, Classes, LCLIntf, LCLType;
+  ButtonBase, Classes, LCLIntf, LCLType,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
 type

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}
-  Graphics, Controls,{$ENDIF}
-  Classes;
+  Classes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls{$ELSE}
+  Graphics, Controls{$ENDIF};
 
 type

trunk/Packages/CevoComponents/ButtonN.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}Graphics, Controls,{$ENDIF}
-  Classes, LCLIntf, LCLType, ScreenTools;
+  Classes, LCLIntf, LCLType, ScreenTools,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls{$ELSE}Graphics, Controls{$ENDIF};
 
 type

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Forms, Dpi.Common,{$ELSE}
-  Forms,{$ENDIF}
   Classes, SysUtils, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
-  Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
-  {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF};
+  Messages, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
+  {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF},
+  {$IFDEF DPI}Dpi.Forms, Dpi.Common, Dpi.Graphics, Dpi.Controls{$ELSE}
+  Forms, Graphics, Controls{$ENDIF};
 
 type
@@ -98 +98 @@
   Pos: TPoint;
 begin
-  if BorderStyle <> bsNone then
+  if BorderStyle <> TBorderStyle.bsNone then
     inherited
   else
@@ -252 +252 @@
   Left := (Screen.Width - Width) div 2;
   Canvas.Font.Assign(UniFont[ftNormal]);
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
   MessgText := '';
   TopSpace := 0;

trunk/Packages/CevoComponents/EOTButton.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
-  ButtonBase, Classes, SysUtils, LCLIntf, LCLType;
+  ButtonBase, Classes, SysUtils, LCLIntf, LCLType,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
 const

trunk/Packages/CevoComponents/GraphicSet.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics,{$ELSE}
-  Graphics,{$ENDIF}
   Classes, SysUtils, Generics.Collections, LCLType, DOM,
-  XMLRead, XMLWrite, XML;
+  XMLRead, XMLWrite, XML,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}
+  Graphics{$ENDIF};
 
 type

trunk/Packages/CevoComponents/Texture.pas

@@ -4 +4 @@
 
 uses
-  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
-  Classes, SysUtils;
+  Classes, SysUtils,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
 type

trunk/Packages/DpiControls/Dpi.Controls.pas

@@ -14 +14 @@
   TKeyEvent = Controls.TKeyEvent;
   TAlign = Controls.TAlign;
+  TBorderStyle = Controls.TBorderStyle;
 
   { TControlEx }

trunk/Settings.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Dialogs, LCLProc, ScreenTools, Messg, ButtonA,
-  Directories, DrawDlg, ButtonC, KeyBindings, Languages, System.UITypes,
-  {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls{$ELSE}
+  Directories, DrawDlg, ButtonC, KeyBindings, Languages,
+  {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls, System.UITypes{$ELSE}
   Forms, Controls, Graphics, StdCtrls{$ENDIF};
 

trunk/Start.pas

@@ -8 +8 @@
   LCLIntf, LCLType, SysUtils, Classes,
   Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain, Translator,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus{$ELSE}
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus,
+  System.UITypes{$ELSE}
   Graphics, Controls, Forms, StdCtrls, Menus{$ENDIF};