Changeset 89 for trunk/LocalPlayer/Term.pas

Timestamp:

Jan 19, 2017, 8:40:22 PM (7 years ago)

Author:

chronos

Message:

• Modified: Simplified PVSB.TPVScrollBar class and fixed wrong scrolling under Windows.
• Modified: Enabled Windows XP manifest to have themed scrollbars.

File:

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

trunk/LocalPlayer/Term.pas

@@ -1474 +1474 @@
     StayOnTop_Ensured := false;
 
-    sb.Setup(0, 0, 0, Self);
+    sb := TPVScrollbar.Create(Self);
     sb.OnUpdate := ScrollBarUpdate;
   end; { InitModule }
@@ -3435 +3435 @@
     SoundMode := smOn;
 
-  sb := TPVScrollbar.Create;
 {$IFDEF WINDOWS}{ TODO }
   Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
@@ -3576 +3575 @@
   EOT.Top := ClientHeight - 64;
   EOT.Left := ClientWidth - 62;
-  sb.ScrollBar.BorderSpacing.Top := ClientHeight - yTroop - 24;
-  sb.ScrollBar.BorderSpacing.Right := ClientWidth - xRightPanel + 8;
-  sb.ScrollBar.BorderSpacing.Bottom := 8;
+  sb.SetBorderSpacing(ClientHeight - yTroop - 24, ClientWidth - xRightPanel + 8, 8);
+  {TODO:
   SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
     ClientHeight - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
+    }
   MapBtn0.Left := xMini + G.lx - 44;
   MapBtn0.Top := ClientHeight - 15;
@@ -4414 +4413 @@
       for i := 0 to nBrushTypes - 1 do
       begin // display terrain types
-        if (Count >= TrRow * sb.si.npos) and (Count < TrRow * (sb.si.npos + 1))
+        if (Count >= TrRow * sb.Position) and (Count < TrRow * (sb.Position + 1))
         then
         begin
-          trix[Count - TrRow * sb.si.npos] := BrushTypes[i];
-          x := (Count - TrRow * sb.si.npos) * TrPitch;
+          trix[Count - TrRow * sb.Position] := BrushTypes[i];
+          x := (Count - TrRow * sb.Position) * TrPitch;
           xSrcBase := -1;
           case BrushTypes[i] of
@@ -4646 +4645 @@
                   if unx.Loc = TroopLoc then
                   begin
-                    if (Count >= TrRow * sb.si.npos) and
-                      (Count < TrRow * (sb.si.npos + 1)) then
+                    if (Count >= TrRow * sb.Position) and
+                      (Count < TrRow * (sb.Position + 1)) then
                     begin
-                      trix[Count - TrRow * sb.si.npos] := uix;
+                      trix[Count - TrRow * sb.Position] := uix;
                       MakeUnitInfo(me, unx, UnitInfo);
-                      x := (Count - TrRow * sb.si.npos) * TrPitch;
+                      x := (Count - TrRow * sb.Position) * TrPitch;
                       if uix = UnFocus then
                       begin
@@ -4700 +4699 @@
           Server(sGetUnits, me, TroopLoc, Count);
           for i := 0 to Count - 1 do
-            if (i >= TrRow * sb.si.npos) and (i < TrRow * (sb.si.npos + 1)) then
+            if (i >= TrRow * sb.Position) and (i < TrRow * (sb.Position + 1)) then
             begin // display enemy units
-              trix[i - TrRow * sb.si.npos] := i;
-              x := (i - TrRow * sb.si.npos) * TrPitch;
+              trix[i - TrRow * sb.Position] := i;
+              x := (i - TrRow * sb.Position) * TrPitch;
               NoMap.SetOutput(Panel);
               NoMap.PaintUnit(xTroop + 2 + x, yTroop + 1,
@@ -6348 +6347 @@
   begin
     sb.Init((TrCnt + TrRow - 1) div TrRow - 1, 1);
-    with sb.si do
-      if (nMax >= integer(nPage)) and (trixFocus >= 0) then
-      begin
-        sb.si.npos := trixFocus div TrRow;
-        sb.si.FMask := SIF_POS;
-        SetScrollInfo(sb.ScrollBar.Handle, SB_CTL, sb.si, true);
-      end
-  end
+    if (sb.Max >= sb.PageSize) and (trixFocus >= 0) then
+      sb.Position := trixFocus div TrRow;
+  end;
 end;