diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-10 12:40:29 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-10 12:40:56 +0200 |
| commit | 6b0cd62e5ecad075c4528d3a09ec903ab057680e (patch) | |
| tree | daa08ef647df36a774c5ce78738dffb9c2d154bf /src/gui/kernel | |
| parent | f56a905ced02b387f6ac7f482f997629f27bcf89 (diff) | |
Added frameMargins() API and support in XCB plugin.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qplatformwindow_qpa.cpp | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformwindow_qpa.h | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.h | 3 |
4 files changed, 19 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index cba5529df4..feffd0cfed 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow_qpa.cpp @@ -108,6 +108,11 @@ QRect QPlatformWindow::geometry() const return d->rect; } +QMargins QPlatformWindow::frameMargins() const +{ + return QMargins(); +} + /*! Reimplemented in subclasses to show the surface if \a visible is \c true, and hide it if \a visible is \c false. diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h index 72f63ebcef..8166344246 100644 --- a/src/gui/kernel/qplatformwindow_qpa.h +++ b/src/gui/kernel/qplatformwindow_qpa.h @@ -44,6 +44,7 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qrect.h> +#include <QtCore/qmargins.h> #include <QtCore/qstring.h> #include <QtGui/qwindowdefs.h> @@ -71,6 +72,8 @@ public: virtual void setGeometry(const QRect &rect); virtual QRect geometry() const; + virtual QMargins frameMargins() const; + virtual void setVisible(bool visible); virtual Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); virtual Qt::WindowState setWindowState(Qt::WindowState state); diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 97e74c5652..9ba8af2d2d 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -396,6 +396,14 @@ QRect QWindow::geometry() const return d->geometry; } +QMargins QWindow::frameMargins() const +{ + Q_D(const QWindow); + if (d->platformWindow) + return d->platformWindow->frameMargins(); + return QMargins(); +} + void QWindow::setWindowIcon(const QImage &icon) const { Q_UNUSED(icon); diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 4356153683..7910c3884c 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -44,6 +44,7 @@ #include <QtCore/QObject> #include <QtCore/QEvent> +#include <QtCore/QMargins> #include <QtGui/qguiglformat_qpa.h> #include <QtGui/qwindowdefs.h> @@ -138,6 +139,8 @@ public: void setGeometry(const QRect &rect); QRect geometry() const; + QMargins frameMargins() const; + void setWindowIcon(const QImage &icon) const; void destroy(); |