diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-17 13:56:09 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-17 13:56:09 (GMT) |
| commit | 68c9608ada554c0b1f0cd755b0d783ff6e0001c2 (patch) | |
| tree | 085562d804b9ae1e19f8e03a8e023c4329f8dc73 /src/gui/kernel/qapplication_x11.cpp | |
| parent | 5f6c0594f07df57af2574be0420a68f84b703b87 (diff) | |
| parent | 13254da6c3192937812983f44ce95fe8e1bc602c (diff) | |
| download | Qt-68c9608ada554c0b1f0cd755b0d783ff6e0001c2.zip Qt-68c9608ada554c0b1f0cd755b0d783ff6e0001c2.tar.gz Qt-68c9608ada554c0b1f0cd755b0d783ff6e0001c2.tar.bz2 | |
Merge branch 'screencountchanged'
Reviewed-by: denis
Reviewed-by: Prasanth
Diffstat (limited to 'src/gui/kernel/qapplication_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 77e29a6..76138f8 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -3453,19 +3453,10 @@ int QApplication::x11ProcessEvent(XEvent* event) QSize oldSize(w->size()); w->data->crect.setWidth(DisplayWidth(X11->display, scr)); w->data->crect.setHeight(DisplayHeight(X11->display, scr)); - QVarLengthArray<QRect> oldSizes(desktop->numScreens()); - for (int i = 0; i < desktop->numScreens(); ++i) - oldSizes[i] = desktop->screenGeometry(i); QResizeEvent e(w->size(), oldSize); QApplication::sendEvent(w, &e); - for (int i = 0; i < qMin(oldSizes.count(), desktop->numScreens()); ++i) { - if (oldSizes[i] != desktop->screenGeometry(i)) - emit desktop->resized(i); - } - for (int i = oldSizes.count(); i < desktop->numScreens(); ++i) - emit desktop->resized(i); // added - for (int i = desktop->numScreens(); i < oldSizes.count(); ++i) - emit desktop->resized(i); // removed + if (w != desktop) + QApplication::sendEvent(desktop, &e); } #endif // QT_NO_XRANDR |