1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made QWindow::setVisible() send show and hide events.

Browse Source 
Change-Id: Ideae15f7bd6801d7afe2354627c0893b0b6a32ca
Reviewed-on: http://codereview.qt.nokia.com/2741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
Samuel Rødal 2011-08-08 12:39:38 +02:00 committed by Gunnar Sletta
parent 2ac6eb142e
commit 24c7776c62
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/kernel/qwindow.cpp
View File

@ -123,7 +123,18 @@ void QWindow::setVisible(bool visible)
if (!d->platformWindow)
create();
if (visible) {
QShowEvent showEvent;
QGuiApplication::sendEvent(this, &showEvent);
}
d->platformWindow->setVisible(visible);
if (!visible) {
QHideEvent hideEvent;
QGuiApplication::sendEvent(this, &hideEvent);
}
}
bool QWindow::visible() const
@ -515,12 +526,10 @@ void QWindow::resizeEvent(QResizeEvent *)
void QWindow::showEvent(QShowEvent *)
{
qDebug() << "unimplemented:" << __FILE__ << __LINE__;
}
void QWindow::hideEvent(QHideEvent *)
{
qDebug() << "unimplemented:" << __FILE__ << __LINE__;
}
bool QWindow::event(QEvent *event)
@ -568,6 +577,14 @@ bool QWindow::event(QEvent *event)
exposeEvent(static_cast<QExposeEvent *>(event));
break;
case QEvent::Show:
showEvent(static_cast<QShowEvent *>(event));
break;
case QEvent::Hide:
hideEvent(static_cast<QHideEvent *>(event));
break;
default:
return QObject::event(event);
}

10
src/plugins/platforms/eglfs/qeglfswindow.cpp
View File

@ -74,14 +74,4 @@ WId QEglFSWindow::winId() const
return m_winid;
}
void QEglFSWindow::setVisible(bool visible)
{
if (visible) {
QWindowSystemInterface::handleMapEvent(window());
} else {
QWindowSystemInterface::handleUnmapEvent(window());
}
}
QT_END_NAMESPACE

2
src/plugins/platforms/eglfs/qeglfswindow.h
View File

@ -58,8 +58,6 @@ public:
void setGeometry(const QRect &);
WId winId() const;
void setVisible(bool visible);
private:
WId m_winid;
};