Fixes the position of misplaced mouse input (QTBUG-22420)
This commit is contained in:
parent
a5d51f892b
commit
420aafa825
|
@ -0,0 +1,65 @@
|
||||||
|
From fba5fce6723a739aec73ef5184ccb6cc425402fe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
||||||
|
Date: Mon, 14 Nov 2011 16:26:15 +0100
|
||||||
|
Subject: [PATCH] Revert "Improved performance of mapFromGlobal/mapToGlobal on
|
||||||
|
X11"
|
||||||
|
|
||||||
|
The change introduces problems with Unity's global menu bar.
|
||||||
|
|
||||||
|
Task-number: QTBUG-22420
|
||||||
|
|
||||||
|
Reviewed-by: denis <denis.dzyubenko@nokia.com>
|
||||||
|
|
||||||
|
This reverts commit cdd776a91e65bf5c30cea1bab9823134a3f797d0.
|
||||||
|
---
|
||||||
|
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 f99cc2c..52e3046 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.6
|
||||||
|
|
9
qt.spec
9
qt.spec
|
@ -11,7 +11,7 @@ Summary: Qt toolkit
|
||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.0
|
Version: 4.8.0
|
||||||
Release: 0.28.rc1%{?dist}
|
Release: 0.29.rc1%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
|
@ -104,6 +104,9 @@ Patch75: qt-ppc64-crash.patch
|
||||||
# Applications crash when using a visual with 24 bits per pixel
|
# Applications crash when using a visual with 24 bits per pixel
|
||||||
# https://bugreports.qt.nokia.com/browse/QTBUG-21754
|
# https://bugreports.qt.nokia.com/browse/QTBUG-21754
|
||||||
Patch100: qt-everywhere-opensource-src-4.8.0-QTBUG-21754.patch
|
Patch100: qt-everywhere-opensource-src-4.8.0-QTBUG-21754.patch
|
||||||
|
# Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" (QTBUG-22420)
|
||||||
|
# Fixes the position of misplaced mouse input
|
||||||
|
Patch101: qt-everywhere-opensource-src-4.8.0-QTBUG-22420-revert-x11-map-global.patch
|
||||||
|
|
||||||
# security patches
|
# security patches
|
||||||
|
|
||||||
|
@ -432,6 +435,7 @@ popd
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .QTBUG-21754
|
%patch100 -p1 -b .QTBUG-21754
|
||||||
|
%patch101 -p1 -b .QTBUG-22420-revert-x11-map-global.patch
|
||||||
|
|
||||||
# security fixes
|
# security fixes
|
||||||
|
|
||||||
|
@ -1065,6 +1069,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 12 2011 Jaroslav Reznik <jreznik@redhat.com> 4.8.0-0.29.rc1
|
||||||
|
- Fixes the position of misplaced mouse input (QTBUG-22420)
|
||||||
|
|
||||||
* Sun Dec 04 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.28.rc1
|
* Sun Dec 04 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.28.rc1
|
||||||
- Control whether icu support is built (#759923)
|
- Control whether icu support is built (#759923)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue