[Pkg-owncloud-commits] [owncloud-client] 298/470: ActivityWidget: Make sure Notification are visible if Activity disabled

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit e896d16f324c369e0e769f98c06a014be54ed787
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Apr 11 15:39:25 2016 +0200

    ActivityWidget: Make sure Notification are visible if Activity disabled
    
    This is the fix for #4651
---
 src/gui/activitywidget.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index e0459d6..ac12256 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -159,7 +159,14 @@ void ActivityWidget::slotAccountActivityStatus(AccountState *ast, int statusCode
     }
 
     int accountCount = AccountManager::instance()->accounts().count();
-    emit hideAcitivityTab(_accountsWithoutActivities.count() == accountCount);
+
+    // hide the activity pane in case there are no accounts enabled.
+    if( _accountsWithoutActivities.count() == accountCount ) {
+        _ui->_headerLabel->hide();
+        _ui->_activityList->hide();
+    }
+    emit hideAcitivityTab(_accountsWithoutActivities.count() == accountCount
+                          && _widgetForNotifId.count() == 0 ); // do not hide if there are notifications
 
     showLabels();
 }
@@ -323,6 +330,8 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
         scheduleWidgetToRemove(widgetToGo, 0);
     }
 
+    emit hideAcitivityTab(false);
+
     _ui->_notifyLabel->setHidden(  _widgetForNotifId.isEmpty() );
     _ui->_notifyScroll->setHidden( _widgetForNotifId.isEmpty() );
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git