diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-16 00:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-16 00:00:13 (GMT) |
| commit | f992096a065c99f8307965f73e29ebad49ee6b9b (patch) | |
| tree | cc31ebf4d7a04e533eb9340114db14cc10e42b58 /src/gui/kernel/qwidget_x11.cpp | |
| parent | 301ec400cf5257d0ce5aec7ac4a9e7a0edf77ca3 (diff) | |
| parent | 19f53dd23c29d9a6b256ea1473b118abcde3cc5a (diff) | |
| download | Qt-f992096a065c99f8307965f73e29ebad49ee6b9b.zip Qt-f992096a065c99f8307965f73e29ebad49ee6b9b.tar.gz Qt-f992096a065c99f8307965f73e29ebad49ee6b9b.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 98c33da..c3362ae 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1336,40 +1336,12 @@ QPoint QWidgetPrivate::mapFromGlobal(const QPoint &pos) const QPoint QWidget::mapToGlobal(const QPoint &pos) const { Q_D(const QWidget); - QPoint offset = data->crect.topLeft(); - const QWidget *w = this; - const QWidget *p = w->parentWidget(); - while (!w->isWindow() && p) { - w = p; - p = p->parentWidget(); - offset += w->data->crect.topLeft(); - } - - const QWidgetPrivate *wd = w->d_func(); - QTLWExtra *tlw = wd->topData(); - if (!tlw->embedded) - return pos + offset; - return d->mapToGlobal(pos); } QPoint QWidget::mapFromGlobal(const QPoint &pos) const { Q_D(const QWidget); - QPoint offset = data->crect.topLeft(); - const QWidget *w = this; - const QWidget *p = w->parentWidget(); - while (!w->isWindow() && p) { - w = p; - p = p->parentWidget(); - offset += w->data->crect.topLeft(); - } - - const QWidgetPrivate *wd = w->d_func(); - QTLWExtra *tlw = wd->topData(); - if (!tlw->embedded) - return pos - offset; - return d->mapFromGlobal(pos); } |