summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-08-10 10:02:22 +0200
committerPaul Olav Tvete <paul.tvete@nokia.com>2011-08-19 11:39:42 +0200
commit9db6c348df79729ebba5069ccd5e5cb960da4000 (patch)
tree55b9db9a8b6b3e8b104aa3f0667304ff920b7b45 /src/plugins/platforms
parentcea41dc0934cd68685eca59b2b43e6b7bb59c943 (diff)
Prevent X errors being generated when setting 0 as width or height.
Change-Id: I38b12471f2c327952c4b5f6acb01c1f1ef53da28 Reviewed-on: http://codereview.qt.nokia.com/2823 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index b83f0123ad..f136b8167f 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -154,6 +154,9 @@ void QXcbWindow::create()
QRect rect = window()->geometry();
QPlatformWindow::setGeometry(rect);
+ rect.setWidth(qBound(1, rect.width(), XCOORD_MAX));
+ rect.setHeight(qBound(1, rect.height(), XCOORD_MAX));
+
xcb_window_t xcb_parent_id = m_screen->root();
if (parent())
xcb_parent_id = static_cast<QXcbWindow *>(parent())->xcb_window();