Changeset 69 for trunk/LocalPlayer/Help.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/Help.pas (modified) (10 diffs)

trunk/LocalPlayer/Help.pas

@@ -47 +47 @@
   end;
 
+  { THelpDlg }
+
   THelpDlg = class(TFramedDlg)
     CloseBtn: TButtonB;
@@ -54 +56 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
+      WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
     procedure FormPaint(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
@@ -65 +69 @@
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure SearchBtnClick(Sender: TObject);
-  public
-    Difficulty: integer;
-    procedure ShowNewContent(NewMode, Category, Index: integer);
-    procedure ClearHistory;
-    function TextIndex(Item: string): integer;
   protected
     procedure OffscreenPaint; override;
@@ -87 +86 @@
     HistPos: array [0 .. MaxHist - 1] of integer;
     HistSearchContent: array [0 .. MaxHist - 1] of shortstring;
+    procedure ScrollBarUpdate(Sender: TObject);
     procedure line(ca: TCanvas; i: integer; lit: boolean);
     procedure Prepare(sbPos: integer = 0);
@@ -92 +92 @@
     procedure Search(SearchString: string);
     procedure OnScroll(var m: TMessage); message WM_VSCROLL;
-    procedure OnMouseWheel(var m: TMessage); message LM_MOUSEWHEEL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
+  public
+    Difficulty: integer;
+    procedure ShowNewContent(NewMode, Category, Index: integer);
+    procedure ClearHistory;
+    function TextIndex(Item: string): integer;
   end;
 
@@ -202 +206 @@
   SearchResult.OwnsObjects := True;
   sb := TPVScrollbar.Create;
-  CreatePVSB(sb, Handle, 36, 551, 36 + 432);
+  sb.Setup(36, 9, 11, Self);
+  sb.OnUpdate := ScrollBarUpdate;
 
   HelpText := TStringTable.Create;
@@ -247 +252 @@
 end;
 
+procedure THelpDlg.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;
+
 procedure THelpDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
 procedure THelpDlg.OnScroll(var m: TMessage);
 begin
-  if ProcessPVSB(sb, m) then
-  begin
+  if sb.Process(m) then begin
     Sel := -1;
     SmartUpdateContent(true)
@@ -261 +274 @@
 end;
 
-procedure THelpDlg.OnMouseWheel(var m: TMessage);
-begin
-  if ProcessMouseWheel(sb, m) then
-  begin
-    Sel := -1;
-    SmartUpdateContent(true);
-    PaintBox1MouseMove(nil, [], m.lParam and $FFFF - Left,
-      m.lParam shr 16 - Top);
-  end
-end;
-
 procedure THelpDlg.OnMouseLeave(var Msg: TMessage);
 begin
-  if Sel <> -1 then
-  begin
+  if Sel <> -1 then begin
     line(Canvas, Sel, false);
     Sel := -1
@@ -771 +772 @@
   MarkUsedOffscreen(InnerWidth, InnerHeight + 13 + 48);
 end; { OffscreenPaint }
+
+procedure THelpDlg.ScrollBarUpdate(Sender: TObject);
+begin
+  Sel := -1;
+  SmartUpdateContent(true)
+end;
 
 procedure THelpDlg.Prepare(sbPos: integer = 0);
@@ -1835 +1842 @@
       LF;
 
-    InitPVSB(sb, Count - 1, InnerHeight div 24);
-    if sbPos <> 0 then
-    begin
-      sb.si.npos := sbPos;
-      sb.si.FMask := SIF_POS;
-      SetScrollInfo(sb.h, SB_CTL, sb.si, true);
-    end;
+    //Self.Show;
+    sb.Init(Count - 1, InnerHeight div 24);
+    sb.SetPos(sbPos);
     BackBtn.Visible := nHist > 0;
     TopBtn.Visible := (nHist > 0) or (Kind <> hkMisc) or (no <> miscMain);