Changeset 610 for trunk

Timestamp:

Sep 13, 2024, 8:12:07 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Rows scrolling of high number of units in single map tile.

Location:

trunk/LocalPlayer

Files:

• PVSB.pas (modified) (1 diff)
• Term.pas (modified) (6 diffs)

trunk/LocalPlayer/PVSB.pas

@@ -54 +54 @@
   Self.Max := Max;
   ScrollBar.Position := 0;
-  ScrollBar.Visible := Max >= ScrollBar.PageSize;
+  ScrollBar.Visible := Max > ScrollBar.PageSize;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
-  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types,
+  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, Math,
   DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
@@ -315 +315 @@
     Panel: TBitmap;
     TopBar: TBitmap;
-    VerticalScrollBar: TPVScrollbar;
+    VerticalScrollBar: TPVScrollBar;
     Closable: Boolean;
     RepaintOnResize: Boolean;
@@ -5085 +5085 @@
         with MyUn^[UnFocus] do
         with MyModel^[mix] do
+        if (Me >= 0) and (Me < nPl) then
         begin { display info about selected unit }
           if Job = jCity then
@@ -5168 +5169 @@
                   begin
                     if (Count >= TrRow * VerticalScrollBar.Position) and
-                      (Count < TrRow * (VerticalScrollBar.Position + 1)) then
+                      (Count < TrRow * (VerticalScrollBar.Position + 1)) and
+                      (Me >= 0) and (Me < nPl) then
                     begin
                       trix[Count - TrRow * VerticalScrollBar.Position] := uix;
@@ -6886 +6888 @@
   else
   begin
-    VerticalScrollBar.Init((TrCnt + TrRow - 1) div TrRow - 1, 1);
+    VerticalScrollBar.Init(Ceil(TrCnt / TrRow), 1);
     if (VerticalScrollBar.Max >= VerticalScrollBar.PageSize) and (trixFocus >= 0) then
       VerticalScrollBar.Position := trixFocus div TrRow;
@@ -8415 +8417 @@
 procedure TMainScreen.ScrollBarUpdate(Sender: TObject);
 begin
+  {$IFDEF UNIX}
+  // Do not scroll with mouse wheel to and above max value
+  if VerticalScrollBar.Position > VerticalScrollBar.Max - 1 then
+    VerticalScrollBar.Position := VerticalScrollBar.Max - 1;
+  {$ENDIF}
   PanelPaint;
   Update;