diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2013-05-07 01:37:21 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2013-05-07 01:37:21 +0200 |
| commit | 6003bf81107dd9be51589c074b74c5af82bfc8ab (patch) | |
| tree | 502193634979c12b45c2a013668d21556e2c7050 /libsowatch/watchserver.cpp | |
| parent | ae37832316d905889c82706b351b3c037c9e1ab6 (diff) | |
| download | sowatch-6003bf81107dd9be51589c074b74c5af82bfc8ab.tar.gz sowatch-6003bf81107dd9be51589c074b74c5af82bfc8ab.zip | |
testing qml notifications
Diffstat (limited to 'libsowatch/watchserver.cpp')
| -rw-r--r-- | libsowatch/watchserver.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libsowatch/watchserver.cpp b/libsowatch/watchserver.cpp index 0b7b60f..f79b1c1 100644 --- a/libsowatch/watchserver.cpp +++ b/libsowatch/watchserver.cpp @@ -205,6 +205,10 @@ void WatchServer::nextNotification() deactivateActiveWatchlet(); } _watch->displayNotification(n); + if (_notificationWatchlet) { + activateWatchlet(_notificationWatchlet); + _notificationWatchlet->openNotification(n); + } } else if (_currentWatchlet) { activateCurrentWatchlet(); } else { @@ -335,7 +339,10 @@ void WatchServer::removeNotification(Notification::Type type, Notification *n) void WatchServer::goToIdle() { - Q_ASSERT(!_currentWatchlet && !_activeWatchlet); + Q_ASSERT(!_currentWatchlet); + if (_activeWatchlet) { + deactivateActiveWatchlet(); + } _watch->displayIdleScreen(); if (_idleWatchlet) { activateWatchlet(_idleWatchlet); |