luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly send wheel events to widgets that handle them when the associated control is a proxy.

Browse Source 
[GB.QT4]
* BUG: Correctly send wheel events to widgets that handle them when the associated control is a proxy.

[GB.QT5]
* BUG: Correctly send wheel events to widgets that handle them when the associated control is a proxy.
This commit is contained in:
Benoît Minisini 2022-08-02 03:36:49 +02:00
parent 5f62893d8f
commit e65aed8ba9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gb.qt4/src/CWidget.cpp
View File

@ -417,7 +417,7 @@ void CWIDGET_set_allow_focus(void *_object, bool f)
{
if (f)
{
WIDGET->setFocusPolicy(GB.CanRaise(THIS, EVENT_MouseWheel) ? Qt::WheelFocus : Qt::StrongFocus);
WIDGET->setFocusPolicy(THIS->flag.wheel | GB.CanRaise(THIS, EVENT_MouseWheel) ? Qt::WheelFocus : Qt::StrongFocus);
WIDGET->setAttribute(Qt::WA_InputMethodEnabled, true);
}
else
@ -3066,6 +3066,7 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
__MOUSE_WHEEL:
{
QWheelEvent *ev = (QWheelEvent *)event;
bool eat_wheel;
//qDebug("Event on %p %s%s%s", widget,
// real ? "REAL " : "", design ? "DESIGN " : "", child ? "CHILD " : "");
@ -3073,8 +3074,12 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
if (!original)
goto _DESIGN;
eat_wheel = control->flag.wheel;
__MOUSE_WHEEL_TRY_PROXY:
//fprintf(stderr, "wheel on %p %s\n", control, control->name);
if (design || QWIDGET(control)->isEnabled())
{
if (GB.CanRaise(control, EVENT_MouseWheel))
@ -3132,7 +3137,7 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
return true;
}
}
if (EXT(control) && EXT(control)->proxy_for)
{
control = (CWIDGET *)(EXT(control)->proxy_for);
@ -3140,7 +3145,7 @@ bool CWidget::eventFilter(QObject *widget, QEvent *event)
}
}
if (!control->flag.wheel)
if (!eat_wheel)
{
control = (CWIDGET *)CWIDGET_get_parent(control);
if (control)