Changeset 69 for trunk/LocalPlayer/Select.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

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

trunk/LocalPlayer/Select.pas

@@ -18 +18 @@
     kChooseETech, kChooseModel, kChooseEModel, kChooseCity, kChooseECity,
     kStealTech, kGov, kMission);
+
+  { TListDlg }
 
   TListDlg = class(TFramedDlg)
@@ -26 +28 @@
     ToggleBtn: TButtonB;
     Popup: TPopupMenu;
+    procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
+      WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
     procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
       x, y: integer);
@@ -40 +44 @@
     procedure PlayerClick(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
-
+  private
+    Kind: TListKind;
+    LineDistance, MaxLines, cixProject, pView, Sel, DispLines, Layer, nColumn,
+      TechNameSpace, 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;
+    Closable, MultiPage: boolean;
+    ScienceNationDot: TBitmap;
+    procedure ScrollBarUpdate(Sender: TObject);
+    procedure InitLines;
+    procedure line(ca: TCanvas; l: integer; NonText, lit: boolean);
+    function RenameCity(cix: integer): boolean;
+    function RenameModel(mix: integer): boolean;
+    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   public
     result: integer;
@@ -53 +73 @@
     procedure AddCity;
     procedure RemoveUnit;
-
-  private
-    Kind: TListKind;
-    LineDistance, MaxLines, cixProject, pView, Sel, DispLines, Layer, nColumn,
-      TechNameSpace, 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;
-    Closable, MultiPage: boolean;
-    ScienceNationDot: TBitmap;
-    procedure InitLines;
-    procedure line(ca: TCanvas; l: integer; NonText, lit: boolean);
-    function RenameCity(cix: integer): boolean;
-    function RenameModel(mix: integer): boolean;
-    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
-    procedure OnMouseWheel(var m: TMessage); message LM_MOUSEWHEEL;
-    procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   end;
 
@@ -101 +103 @@
   Canvas.Font.Assign(UniFont[ftNormal]);
   sb := TPVScrollbar.Create;
-  CreatePVSB(sb, Handle, 2, 361, 2 + 422);
+  sb.Setup(36, 10, 36, Self);
+  sb.OnUpdate := ScrollBarUpdate;
   InitButtons();
   Kind := kMission;
@@ -132 +135 @@
 procedure TListDlg.OnScroll(var m: TMessage);
 begin
-  if ProcessPVSB(sb, m) then
-  begin
+  if sb.Process(m) then  begin
     Sel := -2;
     SmartUpdateContent(true);
-  end;
-end;
-
-procedure TListDlg.OnMouseWheel(var m: TMessage);
-begin
-  if ProcessMouseWheel(sb, m) then
-  begin
-    Sel := -2;
-    SmartUpdateContent(true);
-    PaintBox1MouseMove(nil, [], m.lParam and $FFFF - Left,
-      m.lParam shr 16 - Top);
   end;
 end;
@@ -834 +825 @@
 end;
 
+procedure TListDlg.FormMouseWheel(Sender: TObject; Shift: TShiftState;
+  WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
+begin
+  if sb.ProcessMouseWheel(WheelDelta) then begin
+    PaintBox1MouseMove(nil, [], MousePos.X - Left,
+      MousePos.Y - Top);
+  end;
+end;
+
 function TListDlg.RenameCity(cix: integer): boolean;
 var
@@ -1599 +1599 @@
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
   CaptionRight := CloseBtn.Left;
-  SetWindowPos(sb.h, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
+  SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
     TitleHeight, GetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
     SWP_NOZORDER or SWP_NOREDRAW);
@@ -1633 +1633 @@
   Sel := -2;
   ScienceNation := -1;
-  InitPVSB(sb, Lines[Layer] - 1, DispLines);
+  sb.Init(Lines[Layer] - 1, DispLines);
 
   OffscreenPaint;
@@ -1749 +1749 @@
   InitLines;
   Sel := -2;
-  InitPVSB(sb, Lines[Layer] - 1, DispLines);
+  sb.Init(Lines[Layer] - 1, DispLines);
   OffscreenPaint;
   Invalidate
@@ -1762 +1762 @@
 
   Sel := -2;
-  InitPVSB(sb, Lines[Layer] - 1, DispLines);
+  sb.Init(Lines[Layer] - 1, DispLines);
   SmartUpdateContent
 end;
@@ -1863 +1863 @@
 end;
 
+procedure TListDlg.ScrollBarUpdate(Sender: TObject);
+begin
+  Sel := -2;
+  SmartUpdateContent(true);
+end;
+
 end.