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

trunk/LocalPlayer/Select.pas

@@ -102 +102 @@
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
-  sb := TPVScrollbar.Create;
-  sb.Setup(36, 10, 36, Self);
+  sb := TPVScrollbar.Create(Self);
+  sb.SetBorderSpacing(36, 10, 36);
   sb.OnUpdate := ScrollBarUpdate;
   InitButtons();
@@ -135 +135 @@
 procedure TListDlg.OnScroll(var m: TMessage);
 begin
+  { TODO: Handled by MouseWheel event
   if sb.Process(m) then  begin
     Sel := -2;
     SmartUpdateContent(true);
   end;
+  }
 end;
 
@@ -234 +236 @@
   CanGrow: boolean;
 begin
-  lix := code[Layer, sb.si.npos + l];
+  lix := code[Layer, sb.Position + l];
   y0 := 2 + (l + 1) * LineDistance;
-  if sb.si.npos + l >= FirstShrinkedLine[Layer] then
-    ofs := (sb.si.npos + l - FirstShrinkedLine[Layer]) and 1 * 33
+  if sb.Position + l >= FirstShrinkedLine[Layer] then
+    ofs := (sb.Position + l - FirstShrinkedLine[Layer]) and 1 * 33
   else { if FirstShrinkedLine[Layer]<Lines[Layer] then }
     ofs := 33;
@@ -468 +470 @@
           begin
             s := Tribe[mox.Owner].ModelName[mox.mix];
-            if (Kind = kAllEModels) and (code[1, sb.si.npos + l] = 0) then
+            if (Kind = kAllEModels) and (code[1, sb.Position + l] = 0) then
               s := Format(Tribe[mox.Owner].TPhrase('OWNED'), [s]);
           end
@@ -753 +755 @@
       end;
     for i := -1 to DispLines do
-      if (i + sb.si.npos >= 0) and (i + sb.si.npos < Lines[Layer]) then
+      if (i + sb.Position >= 0) and (i + sb.Position < Lines[Layer]) then
         Self.line(offscreen.Canvas, i, true, false)
   end;
@@ -766 +768 @@
 begin
   y := y - TitleHeight;
-  i0 := sb.si.npos;
+  i0 := sb.Position;
   Sel0 := Sel;
   if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
@@ -891 +893 @@
   lix: integer;
 begin
-  if sb.si.npos + Sel >= 0 then
-    lix := code[Layer, sb.si.npos + Sel];
+  if sb.Position + Sel >= 0 then
+    lix := code[Layer, sb.Position + Sel];
   if Kind in [kScience, kCities, kCityEvents, kModels, kEModels, kAllEModels]
   then
@@ -920 +922 @@
         kEModels:
           UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent,
-            code[1, sb.si.npos + Sel]);
+            code[1, sb.Position + Sel]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
@@ -1599 +1601 @@
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
   CaptionRight := CloseBtn.Left;
+  { TODO:
   SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
     TitleHeight, GetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
     SWP_NOZORDER or SWP_NOREDRAW);
+  }
 
   if WindowMode = wmModal then