Changeset 471 for trunk/Packages/CevoComponents

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Packages/CevoComponents

Files:

• Area.pas (modified) (1 diff)
• BaseWin.pas (modified) (1 diff)
• ButtonA.pas (modified) (1 diff)
• ButtonB.pas (modified) (1 diff)
• ButtonBase.pas (modified) (1 diff)
• ButtonN.pas (modified) (1 diff)
• DrawDlg.pas (modified) (3 diffs)
• EOTButton.pas (modified) (1 diff)
• GraphicSet.pas (modified) (1 diff)
• Texture.pas (modified) (1 diff)

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