aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Lind <jussi.lind@nokia.com>2010-12-16 13:30:42 +0200
committerStanislav Ionascu <stanislav.ionascu@nokia.com>2011-01-04 15:17:13 +0200
commit62f12d2d57332718b42f1b2ae946115e2f12be42 (patch)
tree3256c11c3d841f7f18547cce408c2aeea05671ed
parent8cdff92eb38a6896d4a79d06a5b7e0194cd8e03b (diff)
Fixes: NB#205637 - mwindow displayEntered/displayExited vague documentation
RevBy: Antti Kervinen, Stanislav Ionascu Merge-Request: 1053
-rw-r--r--src/corelib/widgets/mwindow.h29
1 files changed, 18 insertions, 11 deletions
diff --git a/src/corelib/widgets/mwindow.h b/src/corelib/widgets/mwindow.h
index eb6a6dfc..11c00c70 100644
--- a/src/corelib/widgets/mwindow.h
+++ b/src/corelib/widgets/mwindow.h
@@ -357,7 +357,12 @@ public:
*/
void setOrientationLocked(bool locked);
- //! Returns the current visibility state of the window.
+ /*! Returns true if user can see the window.
+ * This is different from QWidget::isVisible(), which is always
+ * explicitly set in the application. QWidget::isVisible() doesn't
+ * know if the window is e.g. covered by another window and cannot be
+ * seen.
+ */
bool isOnDisplay() const;
/*! Returns true if the window is currently minimized to the switcher.
@@ -475,16 +480,22 @@ Q_SIGNALS:
void orientationChangeFinished(M::Orientation);
/*!
- This signal is emitted when the window is shown or is not obscured anymore by another window.
+ This signal is emitted when:
+ - the window becomes visible
+ - is not obscured anymore by another window
- Note: this is different from Qt's visibilityChanged(), which is emitted due to show() and hide().
+ Calling show() will emit displayEntered() when the window becomes
+ visible.
*/
void displayEntered();
/*!
- A signal that is emitted when the window gets obscured by another window.
+ A signal that is emitted when:
+ - the window has been obscured by another window approximately for one second
+ - the window gets hidden
+ - the window gets closed
- Note: this is different from Qt's visibilityChanged(), which is emitted due to show() and hide().
+ Calling close() will immediately emit displayExited().
*/
void displayExited();
@@ -513,16 +524,12 @@ protected:
virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);
/*!
- A handler that is called when the window is shown or is not obscured anymore by another window.
-
- Note: this is different from Qt's visibilityChanged(), which is emitted due to show() and hide().
+ * A handler that is called just before displayEntered() is emitted.
*/
virtual void enterDisplayEvent();
/*!
- A handler that is called when the window gets obscured by another window.
-
- Note: this is different from Qt's visibilityChanged(), which is emitted due to show() and hide().
+ * A handler that is called just before displayExited() is emitted.
*/
virtual void exitDisplayEvent();