AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The proper fix for subwindow parenting issues.

Browse Source 
The previous patch tried to work around the fact that Qt::SubWindow
accidentally pulled in Qt::Window. This patch corrects the root
cause of the problem.
This commit is contained in:
Laszlo Agocs 2011-05-27 16:06:53 +02:00
parent b48abb631f
commit ef8e5af1d2
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qnamespace.h
View File

@ -278,7 +278,7 @@ public:
ToolTip = Popup | Sheet,
SplashScreen = ToolTip | Dialog,
Desktop = 0x00000010 | Window,
SubWindow = Desktop | Dialog,
SubWindow = 0x00000012,
WindowType_Mask = 0x000000ff,
MSWindowsFixedSizeDialogHint = 0x00000100,

14
src/widgets/kernel/qwidget_qpa.cpp
View File

@ -96,6 +96,12 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
QWindowSurface *surface = q->windowSurface();
QWindow *win = topData()->window;
// topData() ensures the extra is created but does not ensure 'window' is non-null
// in case the extra was already valid.
if (!win) {
createTLSysExtra();
win = topData()->window;
}
win->setWindowFlags(data.window_flags);
win->setGeometry(q->geometry());
@ -250,8 +256,8 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
QPoint QWidget::mapToGlobal(const QPoint &pos) const
{
int x=pos.x(), y=pos.y();
const QWidget* w = this;
int x = pos.x(), y = pos.y();
const QWidget *w = this;
while (w) {
x += w->data->crect.x();
y += w->data->crect.y();
@ -262,8 +268,8 @@ QPoint QWidget::mapToGlobal(const QPoint &pos) const
QPoint QWidget::mapFromGlobal(const QPoint &pos) const
{
int x=pos.x(), y=pos.y();
const QWidget* w = this;
int x = pos.x(), y = pos.y();
const QWidget *w = this;
while (w) {
x -= w->data->crect.x();
y -= w->data->crect.y();