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

gtk: don't apply SubstractScroll for gtk1 widgetset

Browse Source 
git-svn-id: trunk@20428 -
This commit is contained in:
paul 2009-06-05 09:20:11 +00:00
parent 6bd157f740
commit 3c4f8ff042
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/gtk/gtkcallback.inc
View File

@ -1132,7 +1132,9 @@ begin
MappedXY := TranslateGdkPointToClientArea(Event^.Window, MappedXY := TranslateGdkPointToClientArea(Event^.Window,
Point(TruncToInt(Event^.X), TruncToInt(Event^.Y)), Point(TruncToInt(Event^.X), TruncToInt(Event^.Y)),
PGtkWidget(AWinControl.Handle)); PGtkWidget(AWinControl.Handle));
{$ifndef gtk1}
MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY); MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY);
{$endif}
ShiftState := GTKEventStateToShiftState(Event^.State); ShiftState := GTKEventStateToShiftState(Event^.State);
with Msg do with Msg do
@ -1429,7 +1431,9 @@ begin
ShiftState := GTKEventStateToShiftState(Event^.State); ShiftState := GTKEventStateToShiftState(Event^.State);
MappedXY := TranslateGdkPointToClientArea(Event^.Window, EventXY, MappedXY := TranslateGdkPointToClientArea(Event^.Window, EventXY,
PGtkWidget(AWinControl.Handle)); PGtkWidget(AWinControl.Handle));
{$ifndef gtk1}
MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY); MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY);
{$endif}
//DebugLn('DeliverMouseDownMessage ',DbgSName(AWinControl),' Mapped=',dbgs(MappedXY.X),',',dbgs(MappedXY.Y),' Event=',dbgs(EventXY.X),',',dbgs(EventXY.Y)); //DebugLn('DeliverMouseDownMessage ',DbgSName(AWinControl),' Mapped=',dbgs(MappedXY.X),',',dbgs(MappedXY.Y),' Event=',dbgs(EventXY.X),',',dbgs(EventXY.Y));
if event^.Button in [4, 5] then if event^.Button in [4, 5] then
@ -1687,7 +1691,9 @@ begin
MappedXY := TranslateGdkPointToClientArea(Event^.Window, MappedXY := TranslateGdkPointToClientArea(Event^.Window,
Point(TruncToInt(Event^.X), TruncToInt(Event^.Y)), Point(TruncToInt(Event^.X), TruncToInt(Event^.Y)),
PGtkWidget(AWinControl.Handle)); PGtkWidget(AWinControl.Handle));
{$ifndef gtk1}
MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY); MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY);
{$endif}
//DebugLn(['DeliverMouseUpMessage ',GetWidgetDebugReport(Widget),' ',dbgsName(AWinControl),' ',dbgs(MappedXY)]); //DebugLn(['DeliverMouseUpMessage ',GetWidgetDebugReport(Widget),' ',dbgsName(AWinControl),' ',dbgs(MappedXY)]);
case event^.Button of case event^.Button of

1
lcl/interfaces/gtk/gtkproc.pp
View File

@ -451,6 +451,7 @@ function GetWidgetOrigin(TheWidget: PGtkWidget): TPoint;
function GetWidgetClientOrigin(TheWidget: PGtkWidget): TPoint; function GetWidgetClientOrigin(TheWidget: PGtkWidget): TPoint;
function TranslateGdkPointToClientArea(SourceWindow: PGdkWindow; function TranslateGdkPointToClientArea(SourceWindow: PGdkWindow;
SourcePos: TPoint; DestinationWidget: PGtkWidget): TPoint; SourcePos: TPoint; DestinationWidget: PGtkWidget): TPoint;
function SubtractScoll(AWidget: PGtkWidget; APosition: TPoint): TPoint;
// mouse capturing // mouse capturing
procedure CaptureMouseForWidget(Widget: PGtkWidget; Owner: TMouseCaptureType); procedure CaptureMouseForWidget(Widget: PGtkWidget; Owner: TMouseCaptureType);

1
lcl/interfaces/gtk2/gtk2callback.inc
View File

@ -128,6 +128,7 @@ begin
ShiftState := GTKEventStateToShiftState(Event^.State); ShiftState := GTKEventStateToShiftState(Event^.State);
MappedXY:=TranslateGdkPointToClientArea(Event^.Window,EventXY, MappedXY:=TranslateGdkPointToClientArea(Event^.Window,EventXY,
PGtkWidget(AWinControl.Handle)); PGtkWidget(AWinControl.Handle));
MappedXY := SubtractScoll(PGtkWidget(AWinControl.Handle), MappedXY);
//DebugLn('gtkMouseWheelCB ',DbgSName(AWinControl),' Mapped=',dbgs(MappedXY.X),',',dbgs(MappedXY.Y),' Event=',dbgs(EventXY.X),',',dbgs(EventXY.Y)); //DebugLn('gtkMouseWheelCB ',DbgSName(AWinControl),' Mapped=',dbgs(MappedXY.X),',',dbgs(MappedXY.Y),' Event=',dbgs(EventXY.X),',',dbgs(EventXY.Y));
// this is a mouse wheel event // this is a mouse wheel event