paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 02:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Carbon,QtMac: fixed wrong behaviour of mouse wheel scroll,because LCL assumes 120 as wheel delta.issue #20888

Browse Source 
git-svn-id: trunk@34137 -
This commit is contained in:
zeljko 2011-12-12 16:54:28 +00:00
parent e52894ea3f
commit 2b4adf30f7
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/carbon/carbonprivatewindow.inc
View File

@ -116,6 +116,8 @@ const
function GetMouseWheelDelta: Integer; function GetMouseWheelDelta: Integer;
var var
WheelDelta: SInt32; WheelDelta: SInt32;
CCtl: TCarbonCustomControl;
ScrollInfo: TScrollInfo;
begin begin
Result := 0; Result := 0;
@ -127,7 +129,22 @@ const
// Carbon's WheelDelta is the number of lines to be scrolled // Carbon's WheelDelta is the number of lines to be scrolled
// LCL expects the delta to be 120 for each wheel step, which should scroll // LCL expects the delta to be 120 for each wheel step, which should scroll
// Mouse.WheelScrollLines lines (defaults to three) // Mouse.WheelScrollLines lines (defaults to three)
// Update: 20111212 by zeljko: All widgetsets sends WheelDelta +-120
// mac sends 1 or -1 so we just recalc that to wheel delta. see issue #20888
Result := (120 * WheelDelta) div Mouse.WheelScrollLines; Result := (120 * WheelDelta) div Mouse.WheelScrollLines;
if Widget.ClassType = TCarbonCustomControl then
begin
CCtl := TCarbonCustomControl(Widget);
if CCtl.GetScrollbarVisible(SB_VERT) then
begin
FillChar(ScrollInfo, SizeOf(ScrollInfo), #0);
ScrollInfo.fMask := SIF_TRACKPOS;
ScrollInfo.cbSize := SizeOf(ScrollInfo);
CCtl.GetScrollInfo(SB_VERT, ScrollInfo);
if (WheelDelta > 0) and (ScrollInfo.nTrackPos = 0) then
Result := 120;
end;
end;
{$IFDEF VerboseMouse} {$IFDEF VerboseMouse}
DebugLn('GetMouseWheelDelta WheelDelta=', DbgS(WheelDelta), ' ', HexStr(WheelDelta, 8)); DebugLn('GetMouseWheelDelta WheelDelta=', DbgS(WheelDelta), ' ', HexStr(WheelDelta, 8));
{$ENDIF} {$ENDIF}

28
lcl/interfaces/qt/qtwidgets.pas
View File

@ -3277,6 +3277,9 @@ var
MousePos: TQtPoint; MousePos: TQtPoint;
Modifiers: QtKeyboardModifiers; Modifiers: QtKeyboardModifiers;
ModifierState: PtrInt; ModifierState: PtrInt;
{$IFDEF DARWIN}
CCtl: TQtAbstractScrollArea;
{$ENDIF}
begin begin
Result := False; Result := False;
if not CanSendLCLMessage or (LCLObject = nil) then if not CanSendLCLMessage or (LCLObject = nil) then
@ -3307,6 +3310,31 @@ begin
Msg.WheelDelta := QWheelEvent_delta(QWheelEventH(Event)); Msg.WheelDelta := QWheelEvent_delta(QWheelEventH(Event));
{$IFDEF DARWIN}
// LCL expects delta +-120, we must fix it. issue #20888
if (ChildOfComplexWidget in [ccwCustomControl, ccwAbstractScrollArea,
ccwScrollingWinControl]) then
begin
if (Msg.WheelDelta > 0) then
Msg.WheelDelta := 1
else
Msg.WheelDelta := -1;
Msg.WheelDelta := (120 * Msg.WheelDelta) div Mouse.WheelScrollLines;
if FOwner <> nil then
CCtl := TQtAbstractScrollArea(FOwner)
else
CCtl := TQtAbstractScrollArea(Self);
//now fix ugly behaviour.
if (Msg.WheelDelta > 0) and (CCtl.FVScrollbar.getVisible) and
((CCtl.FVScrollBar = Self) or
(Assigned(CCtl.FVScrollbar) and (Self <> CCtl.FHScrollbar))) then
begin
if CCtl.FVScrollbar.getSliderPosition <= 1 then
Msg.WheelDelta := 120;
end;
end;
{$ENDIF}
NotifyApplicationUserInput(Msg.Msg); NotifyApplicationUserInput(Msg.Msg);
Result := DeliverMessage(Msg) <> 0; Result := DeliverMessage(Msg) <> 0;