Changeset 90

Timestamp:

Jan 19, 2017, 9:04:16 PM (7 years ago)

Author:

chronos

Message:

• Fixed: To work scrollbar correctly again on Linux where Max behaves differently when on Windows.

Location:

trunk/LocalPlayer

Files:

• PVSB.pas (modified) (10 diffs)
• Term.lfm (modified) (1 diff)
• Term.pas (modified) (3 diffs)

trunk/LocalPlayer/PVSB.pas

@@ -19 +19 @@
     FOnUpdate: TNotifyEvent;
     ScrollBar: TScrollBar;
+    FMax: Integer;
     function GetMax: Integer;
     function GetPageSize: Integer;
@@ -29 +30 @@
     constructor Create(Parent: TWinControl);
     destructor Destroy; override;
-    procedure Init(Max, Page: Integer);
+    procedure Init(Max, PageSize: Integer);
     procedure SetPos(Pos: Integer);
     function Process(const m: TMessage): boolean;
@@ -48 +49 @@
   Count: Integer = 0;
 
-procedure TPVScrollBar.Init(Max, Page: Integer);
+procedure TPVScrollBar.Init(Max, PageSize: Integer);
 begin
+  ScrollBar.PageSize := PageSize;
   ScrollBar.Min := 0;
-  ScrollBar.Max := Max;
-  ScrollBar.PageSize := Page;
+  Self.Max := Max;
   ScrollBar.Position := 0;
-  ScrollBar.Visible := ScrollBar.Max >= ScrollBar.PageSize;
+  ScrollBar.Visible := Max >= ScrollBar.PageSize;
 end;
 
@@ -68 +69 @@
   NewPos: integer;
 begin
-    if ScrollBar.Max < ScrollBar.PageSize then
+    if Max < ScrollBar.PageSize then
       result := false
     else
@@ -91 +92 @@
         if NewPos < 0 then
           NewPos := 0;
-        if NewPos > ScrollBar.Max - ScrollBar.PageSize + 1 then
-          NewPos := ScrollBar.Max - ScrollBar.PageSize + 1;
+        if NewPos > Max - ScrollBar.PageSize + 1 then
+          NewPos := Max - ScrollBar.PageSize + 1;
         result := NewPos <> ScrollBar.Position;
         if (NewPos <> ScrollBar.Position) or ((m.wParam and $ffff) = SB_ENDSCROLL) then
@@ -106 +107 @@
   NewPos: integer;
 begin
-    if ScrollBar.Max < ScrollBar.PageSize then Result := False
+    if Max < ScrollBar.PageSize then Result := False
     else begin
       NewPos := ScrollBar.Position - Delta div 300;
       if NewPos < 0 then NewPos := 0;
-      if NewPos > ScrollBar.Max - ScrollBar.PageSize + 1 then
-        NewPos := ScrollBar.Max - ScrollBar.PageSize + 1;
+      if NewPos > Max - ScrollBar.PageSize + 1 then
+        NewPos := Max - ScrollBar.PageSize + 1;
       Result := NewPos <> ScrollBar.Position;
       if NewPos <> ScrollBar.Position then begin
@@ -121 +122 @@
 procedure TPVScrollBar.Show(Visible: boolean);
 begin
-  if not Visible or (ScrollBar.Max < ScrollBar.PageSize) then
+  if not Visible or (Max < ScrollBar.PageSize) then
     ScrollBar.Visible := False
     else ScrollBar.Visible := True;
@@ -128 +129 @@
 procedure TPVScrollBar.EndSB;
 begin
-  if ScrollBar.Max < ScrollBar.PageSize then
+  if Max < ScrollBar.PageSize then
     ScrollBar.Position := 0 // hidden
   else begin
-    ScrollBar.Position := ScrollBar.Max - ScrollBar.PageSize + 1;
+    ScrollBar.Position := Max - ScrollBar.PageSize + 1;
   end;
 end;
@@ -151 +152 @@
 procedure TPVScrollBar.SetMax(AValue: Integer);
 begin
-  ScrollBar.Max := AValue;
+  FMax := AValue;
+  ScrollBar.Max := Max{$IFDEF LINUX} - PageSize + 1{$ENDIF};
 end;
 
@@ -166 +168 @@
 function TPVScrollBar.GetMax: Integer;
 begin
-  Result := ScrollBar.Max;
+  Result := FMax;
 end;
 

trunk/LocalPlayer/Term.lfm

@@ -25 +25 @@
   OnMouseMove = FormMouseMove
   OnMouseUp = FormMouseUp
+  OnMouseWheel = FormMouseWheel
   OnPaint = FormPaint
   OnResize = FormResize
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '1.6.2.0'
+  LCLVersion = '1.6.0.4'
   WindowState = wsMaximized
   object UnitBtn: TButtonB

trunk/LocalPlayer/Term.pas

@@ -13 +13 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls,
-  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area;
+  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area, Types;
 
 const
@@ -173 +173 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
+      WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
     procedure Timer1Timer(Sender: TObject);
     procedure MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
@@ -3517 +3519 @@
     if AILogo[i] <> nil then
       FreeAndNil(AILogo[i]);
+end;
+
+procedure TMainScreen.FormMouseWheel(Sender: TObject; Shift: TShiftState;
+  WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
+begin
+  if sb.ProcessMouseWheel(WheelDelta) then begin
+    PanelPaint;
+    Update;
+  end;
 end;