Changeset 439 for trunk

Timestamp:

May 18, 2022, 11:39:46 AM (2 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Select.pas (modified) (23 diffs)

trunk/LocalPlayer/Select.pas

@@ -50 +50 @@
     cixProject: Integer;
     pView: Integer;
-    Sel: Integer;
+    Selected: Integer;
     DispLines: Integer;
     Layer: Integer;
@@ -56 +56 @@
     TechNameSpace: Integer;
     ScienceNation: Integer;
-    sb: TPVScrollbar;
-    Lines, FirstShrinkedLine: array [0 .. MaxLayer - 1] of integer;
-    code: array [0 .. MaxLayer - 1, 0 .. 4095] of integer;
-    Column: array [0 .. nPl - 1] of integer;
+    ScrollBar: TPVScrollbar;
+    Lines: array [0 .. MaxLayer - 1] of Integer;
+    FirstShrinkedLine: array [0 .. MaxLayer - 1] of Integer;
+    code: array [0 .. MaxLayer - 1, 0 .. 4095] of Integer;
+    Column: array [0 .. nPl - 1] of Integer;
     Closable: Boolean;
     MultiPage: Boolean;
@@ -112 +113 @@
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
-  sb := TPVScrollbar.Create(Self);
-  sb.SetBorderSpacing(36, 10, 36);
-  sb.OnUpdate := ScrollBarUpdate;
+  ScrollBar := TPVScrollbar.Create(Self);
+  ScrollBar.SetBorderSpacing(36, 10, 36);
+  ScrollBar.OnUpdate := ScrollBarUpdate;
   InitButtons;
   Kind := kMission;
@@ -128 +129 @@
 procedure TListDlg.FormDestroy(Sender: TObject);
 begin
-  FreeAndNil(sb);
+  FreeAndNil(ScrollBar);
   FreeAndNil(ScienceNationDotBuffer);
 end;
@@ -146 +147 @@
 begin
   { TODO: Handled by MouseWheel event
-  if sb.Process(Msg) then  begin
-    Sel := -2;
+  if ScrollBar.Process(Msg) then  begin
+    Selected := -2;
     SmartUpdateContent(true);
   end;
@@ -155 +156 @@
 procedure TListDlg.OnMouseLeave(var Msg: TMessage);
 begin
-  if not Closable and (Sel <> -2) then
-  begin
-    line(Canvas, Sel, false, false);
-    Sel := -2;
+  if not Closable and (Selected <> -2) then
+  begin
+    line(Canvas, Selected, false, false);
+    Selected := -2;
   end;
 end;
@@ -168 +169 @@
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
-  if Sel <> -2 then
-    line(Canvas, Sel, false, true);
+  if Selected <> -2 then
+    line(Canvas, Selected, false, true);
   s := '';
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) then
@@ -246 +247 @@
   CanGrow: boolean;
 begin
-  lix := code[Layer, sb.Position + l];
+  lix := code[Layer, ScrollBar.Position + l];
   y0 := 2 + (l + 1) * LineDistance;
-  if sb.Position + l >= FirstShrinkedLine[Layer] then
-    ofs := (sb.Position + l - FirstShrinkedLine[Layer]) and 1 * 33
+  if ScrollBar.Position + l >= FirstShrinkedLine[Layer] then
+    ofs := (ScrollBar.Position + l - FirstShrinkedLine[Layer]) and 1 * 33
   else { if FirstShrinkedLine[Layer]<Lines[Layer] then }
     ofs := 33;
@@ -480 +481 @@
           begin
             s := Tribe[mox.Owner].ModelName[mox.mix];
-            if (Kind = kAllEModels) and (code[1, sb.Position + l] = 0) then
+            if (Kind = kAllEModels) and (code[1, ScrollBar.Position + l] = 0) then
               s := Format(Tribe[mox.Owner].TPhrase('OWNED'), [s]);
           end
@@ -766 +767 @@
 
     for i := -1 to DispLines do
-      if (i + sb.Position >= 0) and (i + sb.Position < Lines[Layer]) then
+      if (i + ScrollBar.Position >= 0) and (i + ScrollBar.Position < Lines[Layer]) then
         Self.line(offscreen.Canvas, i, true, false);
   end;
@@ -779 +780 @@
 begin
   y := y - TitleHeight;
-  i0 := sb.Position;
-  Sel0 := Sel;
+  i0 := ScrollBar.Position;
+  Sel0 := Selected;
   if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
     (y < InnerHeight) and (y mod LineDistance >= 4) and (y mod LineDistance < 20)
   then
-    Sel := y div LineDistance - 1
+    Selected := y div LineDistance - 1
   else
-    Sel := -2;
-  if (Sel < -1) or (Sel > DispLines) or (Sel + i0 < 0) or
-    (Sel + i0 >= Lines[Layer]) then
-    Sel := -2;
-  if Sel <> Sel0 then
+    Selected := -2;
+  if (Selected < -1) or (Selected > DispLines) or (Selected + i0 < 0) or
+    (Selected + i0 >= Lines[Layer]) then
+    Selected := -2;
+  if Selected <> Sel0 then
   begin
     if Sel0 <> -2 then
       line(Canvas, Sel0, false, false);
-    if Sel <> -2 then
-      line(Canvas, Sel, false, true);
+    if Selected <> -2 then
+      line(Canvas, Selected, false, true);
   end;
 
@@ -841 +842 @@
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
 begin
-  if sb.ProcessMouseWheel(WheelDelta) then begin
+  if ScrollBar.ProcessMouseWheel(WheelDelta) then begin
     PaintBox1MouseMove(nil, [], MousePos.X - Left,
       MousePos.Y - Top);
@@ -915 +916 @@
   lix: integer;
 begin
-  if sb.Position + Sel >= 0 then
-    lix := code[Layer, sb.Position + Sel];
+  if ScrollBar.Position + Selected >= 0 then
+    lix := code[Layer, ScrollBar.Position + Selected];
   if Kind in [kScience, kCities, kCityEvents, kModels, kEModels, kAllEModels]
   then
@@ -922 +923 @@
   if (ssLeft in Shift) and not(ssShift in Shift) then
   begin
-    if Sel <> -2 then
+    if Selected <> -2 then
     begin
       result := lix;
@@ -931 +932 @@
   else if (ssLeft in Shift) and (ssShift in Shift) then
   begin // show help/info popup
-    if Sel <> -2 then
+    if Selected <> -2 then
       case Kind of
         kCities:
@@ -943 +944 @@
         kEModels:
           UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
-            code[1, sb.Position + Sel]);
+            code[1, ScrollBar.Position + Selected]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
@@ -972 +973 @@
   else if ssRight in Shift then
   begin
-    if Sel <> -2 then
+    if Selected <> -2 then
       case Kind of
         kCities, kCityEvents:
@@ -1562 +1563 @@
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) or (Kind = kModels) or
     (Kind = kEModels) then begin
-    sb.SetBorderSpacing(56, 10, 10);
+    ScrollBar.SetBorderSpacing(56, 10, 10);
     TitleHeight := WideFrame + 20;
   end else begin
-    sb.SetBorderSpacing(36, 10, 34);
+    ScrollBar.SetBorderSpacing(36, 10, 34);
     TitleHeight := WideFrame;
   end;
@@ -1625 +1626 @@
   CaptionRight := CloseBtn.Left;
   { TODO:
-  SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
+  SetWindowPos(ScrollBar.ScrollBar.Handle, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
     TitleHeight, GetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
     SWP_NOZORDER or SWP_NOREDRAW);
@@ -1658 +1659 @@
 
   Layer := 0;
-  Sel := -2;
+  Selected := -2;
   ScienceNation := -1;
-  sb.Init(Lines[Layer] - 1, DispLines);
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
 
   OffscreenPaint;
@@ -1775 +1776 @@
   end;
   InitLines;
-  Sel := -2;
-  sb.Init(Lines[Layer] - 1, DispLines);
+  Selected := -2;
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   OffscreenPaint;
   Invalidate;
@@ -1788 +1789 @@
   Layer := TComponent(Sender).Tag;
 
-  Sel := -2;
-  sb.Init(Lines[Layer] - 1, DispLines);
+  Selected := -2;
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   SmartUpdateContent;
 end;
@@ -1892 +1893 @@
 procedure TListDlg.ScrollBarUpdate(Sender: TObject);
 begin
-  Sel := -2;
+  Selected := -2;
   SmartUpdateContent(true);
 end;