1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper sub-widget mouse grabbing in QWidgetWindow.

Browse Source
This commit is contained in:
Samuel Rødal 2011-05-04 10:42:54 +02:00
parent 07fef33d28
commit c418f5ce8d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/kernel/qwidgetwindow_qpa.cpp
View File

@ -91,13 +91,19 @@ bool QWidgetWindow::event(QEvent *event)
void QWidgetWindow::handleMouseEvent(QMouseEvent *event) void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
{ {
// which child should have it? // which child should have it?
QWidget *widget = m_widget->childAt(event->pos()); QWidget *widget = m_implicit_mouse_grabber ? m_implicit_mouse_grabber.data() : m_widget->childAt(event->pos());
// TODO: make sure mouse release is delivered to same widget that got the press event // TODO: make sure mouse release is delivered to same widget that got the press event
if (!widget) if (!widget)
widget = m_widget; widget = m_widget;
if (event->type() == QEvent::MouseButtonPress && !m_implicit_mouse_grabber)
m_implicit_mouse_grabber = widget;
if (event->buttons() == Qt::NoButton)
m_implicit_mouse_grabber.clear();
QPoint mapped = widget->mapFrom(m_widget, event->pos()); QPoint mapped = widget->mapFrom(m_widget, event->pos());
QMouseEvent translated(event->type(), mapped, event->globalPos(), event->button(), event->buttons(), event->modifiers()); QMouseEvent translated(event->type(), mapped, event->globalPos(), event->button(), event->buttons(), event->modifiers());

1
src/gui/kernel/qwidgetwindow_qpa_p.h
View File

@ -72,6 +72,7 @@ protected:
private: private:
QWidget *m_widget; QWidget *m_widget;
QWeakPointer<QWidget> m_implicit_mouse_grabber;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE