Fix Mouse.FullDelta computation.
[GB.QT4] * BUG: Fix Mouse.FullDelta computation. [GB.QT5] * BUG: Fix Mouse.FullDelta computation.
This commit is contained in:
parent
17f8d757a8
commit
111df19ac2
1 changed files with 6 additions and 6 deletions
|
@ -3115,6 +3115,12 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
|
||||||
|
|
||||||
eat_wheel = control->flag.wheel;
|
eat_wheel = control->flag.wheel;
|
||||||
|
|
||||||
|
if (control != MOUSE_wheel_on_control)
|
||||||
|
{
|
||||||
|
MOUSE_wheel_on_control = control;
|
||||||
|
MOUSE_delta_x = MOUSE_delta_y = 0;
|
||||||
|
}
|
||||||
|
|
||||||
__MOUSE_WHEEL_TRY_PROXY:
|
__MOUSE_WHEEL_TRY_PROXY:
|
||||||
|
|
||||||
//fprintf(stderr, "wheel on %p %s\n", control, control->name);
|
//fprintf(stderr, "wheel on %p %s\n", control, control->name);
|
||||||
|
@ -3149,12 +3155,6 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
|
||||||
MOUSE_info.state = ev->buttons();
|
MOUSE_info.state = ev->buttons();
|
||||||
MOUSE_info.modifier = ev->modifiers();
|
MOUSE_info.modifier = ev->modifiers();
|
||||||
|
|
||||||
if (control != MOUSE_wheel_on_control)
|
|
||||||
{
|
|
||||||
MOUSE_wheel_on_control = control;
|
|
||||||
MOUSE_delta_x = MOUSE_delta_y = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef QT5
|
#ifdef QT5
|
||||||
QPoint delta = ev->angleDelta();
|
QPoint delta = ev->angleDelta();
|
||||||
if (delta.x())
|
if (delta.x())
|
||||||
|
|
Loading…
Reference in a new issue