Changeset 69 for trunk/LocalPlayer/Term.pas

Timestamp:

Jan 14, 2017, 10:33:42 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Implemented platform independent scrollbars usage. Tested on Linux.

File:

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

trunk/LocalPlayer/Term.pas

@@ -22 +22 @@
 
 type
+
+  { TMainScreen }
+
   TMainScreen = class(TDrawDlg)
     Timer1: TTimer;
@@ -216 +219 @@
     procedure BareBtnDownChanged(Sender: TObject);
     procedure MovieSpeedBtnClick(Sender: TObject);
-
-  public
-    procedure CreateParams(var p: TCreateParams); override;
-    procedure Client(Command, NewPlayer: integer; var Data);
-    procedure SetAIName(p: integer; Name: string);
-    function ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
-      ShowEvent: integer = 0): boolean;
-    procedure CityClosed(Activateuix: integer; StepFocus: boolean = false;
-      SelectFocus: boolean = false);
-    function DipCall(Command: integer): integer;
-    function OfferCall(var Offer: TOffer): integer;
-    procedure UpdateViews(UpdateCityScreen: boolean = false);
-    function ContactRefused(p: integer; Item: String): boolean;
-
   private
     xw, yw, xwd, ywd, xwMini, ywMini, xMidPanel, xRightPanel, xTroop, xTerrain,
@@ -242 +231 @@
     Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
       HaveStrategyAdvice, FirstMovieTurn: boolean;
+    procedure ScrollBarUpdate(Sender: TObject);
     procedure ArrangeMidPanel;
     procedure MainOffscreenPaint;
@@ -282 +272 @@
     procedure OnScroll(var m: TMessage); message WM_VSCROLL;
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
+  public
+    procedure CreateParams(var p: TCreateParams); override;
+    procedure Client(Command, NewPlayer: integer; var Data);
+    procedure SetAIName(p: integer; Name: string);
+    function ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
+      ShowEvent: integer = 0): boolean;
+    procedure CityClosed(Activateuix: integer; StepFocus: boolean = false;
+      SelectFocus: boolean = false);
+    function DipCall(Command: integer): integer;
+    function OfferCall(var Offer: TOffer): integer;
+    procedure UpdateViews(UpdateCityScreen: boolean = false);
+    function ContactRefused(p: integer; Item: String): boolean;
   end;
 
@@ -1473 +1475 @@
     StayOnTop_Ensured := false;
 
-    CreatePVSB(sb, Handle, 100 - 200, 122, 100 + MidPanelHeight - 16 - 200);
+    sb.Setup(0, 0, 0, Self);
+    sb.OnUpdate := ScrollBarUpdate;
   end; { InitModule }
 
@@ -2656 +2659 @@
           if Controls[i] is TButtonC then
             Controls[i].Visible := false;
-        InitPVSB(sb, 0, 1);
+        sb.Init(0, 1);
         for p1 := 0 to nPl - 1 do
           if Tribe[p1] <> nil then
@@ -3577 +3580 @@
   EOT.Top := ClientHeight - 64;
   EOT.Left := ClientWidth - 62;
-  SetWindowPos(sb.h, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
+  sb.ScrollBar.BorderSpacing.Top := ClientHeight - yTroop - 24;
+  sb.ScrollBar.BorderSpacing.Right := ClientWidth - xRightPanel + 8;
+  sb.ScrollBar.BorderSpacing.Bottom := 8;
+  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;
@@ -3615 +3621 @@
 procedure TMainScreen.OnScroll(var m: TMessage);
 begin
-  if ProcessPVSB(sb, m) then
-  begin
+  if sb.Process(m) then begin
     PanelPaint;
-    Update
-  end
+    Update;
+  end;
 end;
 
@@ -3962 +3967 @@
 end;
 
-procedure TMainScreen.PaintLocTemp(Loc, Style: integer);
+procedure TMainScreen.PaintLocTemp(Loc: integer; Style: integer);
 var
   y0, x0, xMap, yMap: integer;
@@ -6341 +6346 @@
       Server(sGetUnits, me, Loc, TrCnt);
   if TrCnt = 0 then
-    InitPVSB(sb, 0, 1)
+    sb.Init(0, 1)
   else
   begin
-    InitPVSB(sb, (TrCnt + TrRow - 1) div TrRow - 1, 1);
+    sb.Init((TrCnt + TrRow - 1) div TrRow - 1, 1);
     with sb.si do
       if (nMax >= integer(nPage)) and (trixFocus >= 0) then
@@ -6350 +6355 @@
         sb.si.npos := trixFocus div TrRow;
         sb.si.FMask := SIF_POS;
-        SetScrollInfo(sb.h, SB_CTL, sb.si, true);
+        SetScrollInfo(sb.ScrollBar.Handle, SB_CTL, sb.si, true);
       end
   end
@@ -8005 +8010 @@
 end;
 
+procedure TMainScreen.ScrollBarUpdate(Sender: TObject);
+begin
+  PanelPaint;
+  Update;
+end;
+
 initialization