diff options
author | Corentin Jabot <corentinjabot@gmail.com> | 2012-05-17 10:35:32 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 20:20:52 +0200 |
commit | ce3d1a153aad353ad5e50b935bc1d1494cbbeeee (patch) | |
tree | 48ec8fa90c7aa9d3873b578d7f4668177b62e154 /src/gui/kernel/qwindow.cpp | |
parent | df7a1a28aaab315dc8ed5eb5bac6f4883e646613 (diff) |
Implement QWindow::setWindowIcon
Since QIcon has been moved back to QtGui, QWindow::setWindowIcon can
use it. That way, the api is exactly the same as in QWidgets and one
can deal properly with multi-sized icon.
I added a getter so the api is consistent with QWidget
(Maybe there should be properties for windowIcon and windowTitle)
Change-Id: I2f463dbe39673f41a3201ef8fed27b3fcac2125f
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index d43b37d080..94e8979ca5 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -516,9 +516,8 @@ void QWindow::setWindowTitle(const QString &title) { Q_D(QWindow); d->windowTitle = title; - if (d->platformWindow) { + if (d->platformWindow) d->platformWindow->setWindowTitle(title); - } } QString QWindow::windowTitle() const @@ -528,6 +527,26 @@ QString QWindow::windowTitle() const } /*! + Sets the window icon to the given \a icon. + + The window icon might be used by the windowing system for example to decorate the window, + or in the task switcher. +*/ +void QWindow::setWindowIcon(const QIcon &icon) +{ + Q_D(QWindow); + d->windowIcon = icon; + if (d->platformWindow) + d->platformWindow->setWindowIcon(icon); +} + +QIcon QWindow::windowIcon() const +{ + Q_D(const QWindow); + return d->windowIcon; +} + +/*! Raise the window in the windowing system. Requests that the window be raised to appear above other windows. @@ -535,9 +554,8 @@ QString QWindow::windowTitle() const void QWindow::raise() { Q_D(QWindow); - if (d->platformWindow) { + if (d->platformWindow) d->platformWindow->raise(); - } } /*! @@ -548,9 +566,8 @@ void QWindow::raise() void QWindow::lower() { Q_D(QWindow); - if (d->platformWindow) { + if (d->platformWindow) d->platformWindow->lower(); - } } /*! @@ -1056,18 +1073,6 @@ void QWindow::resize(const QSize &newSize) } /*! - Sets the window icon to the given \a icon image. - - The window icon might be used by the windowing system for example to decorate the window, - or in the task switcher. -*/ -void QWindow::setWindowIcon(const QImage &icon) const -{ - Q_UNUSED(icon); - qDebug() << "unimplemented:" << __FILE__ << __LINE__; -} - -/*! Releases the native platform resources associated with this window. \sa create() |