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

trunk/LocalPlayer/Help.pas

@@ -205 +205 @@
   SearchResult := THyperText.Create;
   SearchResult.OwnsObjects := True;
-  sb := TPVScrollbar.Create;
-  sb.Setup(36, 9, 11, Self);
+  sb := TPVScrollbar.Create(Self);
+  sb.SetBorderSpacing(36, 9, 11);
   sb.OnUpdate := ScrollBarUpdate;
 
@@ -268 +268 @@
 procedure THelpDlg.OnScroll(var m: TMessage);
 begin
+  { TODO: Handled by MouseWheel event
   if sb.Process(m) then begin
     Sel := -1;
     SmartUpdateContent(true)
-  end
+  end;
+  }
 end;
 
@@ -294 +296 @@
   s: string;
 begin
-  s := MainText[sb.si.npos + i];
+  s := MainText[sb.Position + i];
   if s = '' then
     exit;
@@ -304 +306 @@
     y := y + WideFrame
   end;
-  if THelpLineInfo(MainText.Objects[sb.si.npos + i]).Format
+  if THelpLineInfo(MainText.Objects[sb.Position + i]).Format
     in [pkCaption, pkBigTer, pkRightIcon, pkBigFeature] then
   begin
@@ -320 +322 @@
     ca.Font.Assign(UniFont[ftNormal]);
   end
-  else if THelpLineInfo(MainText.Objects[sb.si.npos + i]).Format = pkSection
+  else if THelpLineInfo(MainText.Objects[sb.Position + i]).Format = pkSection
   then
   begin
@@ -339 +341 @@
         TextSize.cy := WideFrame + InnerHeight - y;
       FillSeamless(ca, x, y, TextSize.cx, TextSize.cy, -SideFrame,
-        sb.si.npos * 24 - WideFrame, Paper);
+        sb.Position * 24 - WideFrame, Paper);
     end;
     BiColorTextOut(ca, TextColor, $7F007F, x, y, s);
@@ -441 +443 @@
   CaptionColor := Colors.Canvas.Pixels[clkMisc, cliPaperCaption];
   FillSeamless(OffScreen.Canvas, 0, 0, InnerWidth, InnerHeight, 0,
-    sb.si.npos * 24, Paper);
+    sb.Position * 24, Paper);
   with OffScreen.Canvas do
   begin
     Font.Assign(UniFont[ftNormal]);
-    for i := -sb.si.npos to InnerHeight div 24 do
-      if sb.si.npos + i < MainText.Count then
+    for i := -sb.Position to InnerHeight div 24 do
+      if sb.Position + i < MainText.Count then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.si.npos + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.Position + i]);
         if HelpLineInfo.Format = pkExternal then
         begin
@@ -459 +461 @@
       end;
     for i := -2 to InnerHeight div 24 do
-      if (sb.si.npos + i >= 0) and (sb.si.npos + i < MainText.Count) then
+      if (sb.Position + i >= 0) and (sb.Position + i < MainText.Count) then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.si.npos + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.Position + i]);
         if HelpLineInfo.Link <> 0 then
         begin
@@ -1870 +1872 @@
       HistKind[nHist - 1] := Kind;
       HistNo[nHist - 1] := no;
-      HistPos[nHist - 1] := sb.si.npos;
+      HistPos[nHist - 1] := sb.Position;
       HistSearchContent[nHist - 1] := SearchContent
     end
@@ -1888 +1890 @@
 begin
   y := y - WideFrame;
-  i0 := sb.si.npos;
+  i0 := sb.Position;
   Sel0 := Sel;
   if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
@@ -1911 +1913 @@
 begin
   if Sel >= 0 then
-    with THelpLineInfo(MainText.Objects[Sel + sb.si.npos]) do
+    with THelpLineInfo(MainText.Objects[Sel + sb.Position]) do
       if Link shr 8 and $3F = hkInternet then
         case Link and $FF of