Changeset 535 for trunk

Timestamp:

Apr 15, 2024, 8:39:16 PM (8 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/LocalPlayer/Term.pas

@@ -315 +315 @@
     Panel: TBitmap;
     TopBar: TBitmap;
-    sb: TPVScrollbar;
+    VerticalScrollBar: TPVScrollbar;
     Closable: Boolean;
     RepaintOnResize: Boolean;
@@ -1740 +1740 @@
   StartRunning := False;
 
-  sb := TPVScrollbar.Create(Self);
-  sb.OnUpdate := ScrollBarUpdate;
+  VerticalScrollBar := TPVScrollbar.Create(Self);
+  VerticalScrollBar.OnUpdate := ScrollBarUpdate;
 end;
 
@@ -2795 +2795 @@
           if Controls[I] is TButtonC then
             Controls[I].Visible := False;
-        sb.Init(0, 1);
+        VerticalScrollBar.Init(0, 1);
         for p1 := 0 to nPl - 1 do
           if Tribe[p1] <> nil then
@@ -3602 +3602 @@
 
   MainFormKeyDown := nil;
-  FreeAndNil(sb);
+  FreeAndNil(VerticalScrollBar);
   FreeAndNil(TopBar);
   FreeAndNil(MiniMap);
@@ -3623 +3623 @@
   if (MousePos.Y > ClientHeight - MidPanelHeight) and
     (MousePos.Y < ClientHeight) then begin
-    if sb.ProcessMouseWheel(WheelDelta) then begin
+    if VerticalScrollBar.ProcessMouseWheel(WheelDelta) then begin
       PanelPaint;
       Update;
@@ -4218 +4218 @@
 procedure TMainScreen.OnScroll(var Msg: TMessage);
 begin
-  if sb.Process(Msg) then begin
+  if VerticalScrollBar.Process(Msg) then begin
     PanelPaint;
     Update;
@@ -4921 +4921 @@
       for I := 0 to nBrushTypes - 1 do
       begin // display terrain types
-        if (Count >= TrRow * sb.Position) and (Count < TrRow * (sb.Position + 1))
+        if (Count >= TrRow * VerticalScrollBar.Position) and (Count < TrRow * (VerticalScrollBar.Position + 1))
         then
         begin
-          trix[Count - TrRow * sb.Position] := BrushTypes[I];
-          X := (Count - TrRow * sb.Position) * TrPitch;
+          trix[Count - TrRow * VerticalScrollBar.Position] := BrushTypes[I];
+          X := (Count - TrRow * VerticalScrollBar.Position) * TrPitch;
           xSrcBase := -1;
           case BrushTypes[I] of
@@ -5155 +5155 @@
                   if unx.Loc = TroopLoc then
                   begin
-                    if (Count >= TrRow * sb.Position) and
-                      (Count < TrRow * (sb.Position + 1)) then
+                    if (Count >= TrRow * VerticalScrollBar.Position) and
+                      (Count < TrRow * (VerticalScrollBar.Position + 1)) then
                     begin
-                      trix[Count - TrRow * sb.Position] := uix;
+                      trix[Count - TrRow * VerticalScrollBar.Position] := uix;
                       MakeUnitInfo(Me, unx, UnitInfo);
-                      X := (Count - TrRow * sb.Position) * TrPitch;
+                      X := (Count - TrRow * VerticalScrollBar.Position) * TrPitch;
                       if uix = UnFocus then
                       begin
@@ -5209 +5209 @@
           Server(sGetUnits, Me, TroopLoc, Count);
           for I := 0 to Count - 1 do
-            if (I >= TrRow * sb.Position) and (I < TrRow * (sb.Position + 1)) then
+            if (I >= TrRow * VerticalScrollBar.Position) and (I < TrRow * (VerticalScrollBar.Position + 1)) then
             begin // display enemy units
-              trix[I - TrRow * sb.Position] := I;
-              X := (I - TrRow * sb.Position) * TrPitch;
+              trix[I - TrRow * VerticalScrollBar.Position] := I;
+              X := (I - TrRow * VerticalScrollBar.Position) * TrPitch;
               NoMapPanel.SetOutput(Panel);
               NoMapPanel.PaintUnit(xTroop + 2 + X, yTroop + 1,
@@ -6871 +6871 @@
       Server(sGetUnits, Me, Loc, TrCnt);
   if TrCnt = 0 then
-    sb.Init(0, 1)
+    VerticalScrollBar.Init(0, 1)
   else
   begin
-    sb.Init((TrCnt + TrRow - 1) div TrRow - 1, 1);
-    if (sb.Max >= sb.PageSize) and (trixFocus >= 0) then
-      sb.Position := trixFocus div TrRow;
+    VerticalScrollBar.Init((TrCnt + TrRow - 1) div TrRow - 1, 1);
+    if (VerticalScrollBar.Max >= VerticalScrollBar.PageSize) and (trixFocus >= 0) then
+      VerticalScrollBar.Position := trixFocus div TrRow;
   end;
 end;
@@ -7013 +7013 @@
 procedure TMainScreen.SetFullScreen(Active: Boolean);
 begin
-    if Active and (CurrentWindowState <> TWindowState.wsFullScreen) then begin
-      PrevWindowState := WindowState;
-      CurrentWindowState := TWindowState.wsFullScreen;
+  if Active and (CurrentWindowState <> TWindowState.wsFullScreen) then begin
+    PrevWindowState := WindowState;
+    CurrentWindowState := TWindowState.wsFullScreen;
+    WindowState := CurrentWindowState;
+    {$IFDEF WINDOWS}
+    BorderStyle := TBorderStyle.bsNone;
+    {$ENDIF}
+    BorderIcons := [];
+  end else
+  if not Active and (CurrentWindowState = TWindowState.wsFullScreen) then begin
+    if PrevWindowState = TWindowState.wsMaximized then begin
+      CurrentWindowState := TWindowState.wsNormal;
       WindowState := CurrentWindowState;
-      {$IFDEF WINDOWS}
-      BorderStyle := TBorderStyle.bsNone;
-      {$ENDIF}
-      BorderIcons := [];
-    end else
-    if not Active and (CurrentWindowState = TWindowState.wsFullScreen) then begin
-      if PrevWindowState = TWindowState.wsMaximized then begin
-        CurrentWindowState := TWindowState.wsNormal;
-        WindowState := CurrentWindowState;
-      end else begin
-        CurrentWindowState := PrevWindowState;
-        WindowState := CurrentWindowState;
-        WindowState := TWindowState.wsFullScreen;
-        WindowState := CurrentWindowState;
-      end;
-      {$IFDEF WINDOWS}
-      BorderStyle := TBorderStyle.bsSizeable;
-      {$ENDIF}
-      BorderIcons := [TBorderIcon.biSystemMenu, TBorderIcon.biMinimize,
-        TBorderIcon.biMaximize];
-    end;
+    end else begin
+      CurrentWindowState := PrevWindowState;
+      WindowState := CurrentWindowState;
+      WindowState := TWindowState.wsFullScreen;
+      WindowState := CurrentWindowState;
+    end;
+    {$IFDEF WINDOWS}
+    BorderStyle := TBorderStyle.bsSizeable;
+    {$ENDIF}
+    BorderIcons := [TBorderIcon.biSystemMenu, TBorderIcon.biMinimize,
+      TBorderIcon.biMaximize];
+    if Left < 0 then Left := 0;
+    if Top < 0 then Top := 0;
+  end;
 end;
 
@@ -8319 +8321 @@
   EOT.Top := Height - 64;
   EOT.Left := Width - 62;
-  sb.SetBorderSpacing(Height - yTroop - 24, Width - xRightPanel + 8, 8);
-  SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
+  VerticalScrollBar.SetBorderSpacing(Height - yTroop - 24, Width - xRightPanel + 8, 8);
+  SetWindowPos(VerticalScrollBar.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
     Height - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
   MapBtn0.Left := xMini + G.lx - 44;