Changeset 503 for trunk

Timestamp:

Dec 23, 2023, 8:59:07 PM (11 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• LocalPlayer/Help.pas (modified) (12 diffs)
• Packages/DpiControls/Dpi.StdCtrls.pas (modified) (7 diffs)

trunk/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
-  Messages, SysUtils, Classes, ButtonB, PVSB, Types, Generics.Collections, IsoEngine,
+  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,
   System.UITypes{$ELSE}
@@ -858 +858 @@
           x0[I] := x0[I] + 8;
         end;
-        Self.Line(OffScreen.Canvas, I, False)
+        Self.Line(OffScreen.Canvas, I, False);
       end;
   end;
@@ -1113 +1113 @@
                 Delete(S, 1, P)
               else
-                Delete(S, 1, P - 1)
+                Delete(S, 1, P - 1);
             end;
           '!': // highlighted
@@ -1146 +1146 @@
         repeat
           repeat
-            Inc(P)
+            Inc(P);
           until (P > Length(S)) or (S[P] = ' ') or (S[P] = '\');
           if (BiColorTextWidth(OffScreen.Canvas, Copy(S, 1, P - 1)) <=
@@ -1211 +1211 @@
         MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
           [MainText[Count - 1]]);
-    end
+    end;
   end;
 
@@ -1253 +1253 @@
     I: Integer;
     S: string;
-    sr: TSearchRec;
+    SearchRec: TSearchRec;
     List, Plus: TStringList;
   begin
     List := TStringList.Create;
     Plus := TStringList.Create;
-    if FindFirst(GetGraphicsDir + DirectorySeparator + '*.credits.txt', $27, sr) = 0 then
+    if FindFirst(GetGraphicsDir + DirectorySeparator + '*.credits.txt', $27, SearchRec) = 0 then
       repeat
-        Plus.LoadFromFile(GetGraphicsDir + DirectorySeparator + sr.Name);
+        Plus.LoadFromFile(GetGraphicsDir + DirectorySeparator + SearchRec.Name);
         List.AddStrings(Plus);
-      until FindNext(sr) <> 0;
-    FindClose(sr);
+      until FindNext(SearchRec) <> 0;
+    FindClose(SearchRec);
     FreeAndNil(Plus);
 
@@ -1959 +1959 @@
   if (Sel + i0 >= MainText.Count) or (Sel >= 0) and
     (THelpLineInfo(MainText.Objects[Sel + i0]).Category = hkNoLink) and
-    (THelpLineInfo(MainText.Objects[Sel + i0]).Index = 0)then
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Index = 0) then
     Sel := -1;
   if Sel <> Sel0 then
@@ -2166 +2166 @@
       SearchResult.AddLine(S, pkNormal, 0, hkImp, I, True);
       Include(mIMPHELP, I);
-    end
+    end;
   end;
   for I := 0 to nGov - 1 do
@@ -2187 +2187 @@
     begin
       if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
-        not(I in mADVHELP) then
+        not (I in mADVHELP) then
       begin
         S := Phrases.Lookup('ADVANCES', I);
@@ -2200 +2200 @@
     begin
       if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
-        not(I in mIMPHELP) then
+        not (I in mIMPHELP) then
       begin
         S := Phrases.Lookup('IMPROVEMENTS', I);
@@ -2219 +2219 @@
     begin
       if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
-        not(I in mFEATUREHELP) then
+        not (I in mFEATUREHELP) then
       begin
         S := Phrases.Lookup('FEATURES', I);
@@ -2271 +2271 @@
     while BiColorTextWidth(OffScreen.Canvas, SearchResult[I]) >
       RightMargin - 32 do
-      SearchResult[I] := Copy(SearchResult[I], 1, Length(SearchResult[I]) - 1)
+      SearchResult[I] := Copy(SearchResult[I], 1, Length(SearchResult[I]) - 1);
   end;
 end;

trunk/Packages/DpiControls/Dpi.StdCtrls.pas

@@ -93 +93 @@
   { TButton }
 
-  TButton = class(TControl)
+  TButton = class(TWinControl)
   private
   protected
-    function GetNativeControl: Controls.TControl; override;
+    function GetNativeWinControl: Controls.TWinControl; override;
   public
     NativeButton: StdCtrls.TButton;
@@ -155 +155 @@
   { TScrollBar }
 
-  TScrollBar = class(TControl)
+  TScrollBar = class(TWinControl)
   private
     function GetKind: TScrollBarKind;
@@ -170 +170 @@
     procedure SetPosition(AValue: Integer);
   protected
-    function GetNativeControl: Controls.TControl; override;
+    function GetNativeWinControl: Controls.TWinControl; override;
     function GetNativeScrollBar: StdCtrls.TScrollBar; virtual;
   public
@@ -178 +178 @@
   published
     property PageSize: Integer read GetPageSize write SetPageSize;
-    property Min: Integer read GetMin write SetMin;
-    property Max: Integer read GetMax write SetMax;
-    property Position: Integer read GetPosition write SetPosition;
-    property Kind: TScrollBarKind read GetKind write SetKind;
+    property Min: Integer read GetMin write SetMin default 0;
+    property Max: Integer read GetMax write SetMax default 100;
+    property Position: Integer read GetPosition write SetPosition default 0;
+    property Kind: TScrollBarKind read GetKind write SetKind default sbHorizontal;
     property OnChange: TNotifyEvent read GetOnChange write SetOnChange;
     property Visible;
@@ -197 +197 @@
 begin
   RegisterComponents(DpiControlsComponentPaletteName, [TEdit, TButton,
-    TScrollBar]);
+    TScrollBar, TListBox, TCheckBox, TComboBox]);
 end;
 
@@ -377 +377 @@
 { TButton }
 
-function TButton.GetNativeControl: Controls.TControl;
+function TButton.GetNativeWinControl: Controls.TWinControl;
 begin
   if not Assigned(NativeButton) then NativeButton := StdCtrls.TButton.Create(nil);
@@ -451 +451 @@
 end;
 
-function TScrollBar.GetNativeControl: Controls.TControl;
+function TScrollBar.GetNativeWinControl: Controls.TWinControl;
 begin
   Result := GetNativeScrollBar;