Message bar: do not add menu with "close all" if there is just one message

wonder-sk · wonder-sk · commit 4ad4bdf7049f · 2013-10-28T21:57:30.000+07:00
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
@@ -320,4 +320,8 @@ void QgsMessageBar::resetCountdown()
 void QgsMessageBar::updateItemCount()
 {
   mItemCount->setText( mItems.count() > 0 ? tr( "%n more", "unread messages", mItems.count() ) : QString( "" ) );
+
+  // do not show the down arrow for opening menu with "close all" if there is just one message
+  mCloseBtn->setMenu( mItems.count() > 0 ? mCloseMenu : 0 );
+  mCloseBtn->setPopupMode( mItems.count() > 0 ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup );
 }

Original file line number	Diff line number	Diff line change
`@@ -320,4 +320,8 @@ void QgsMessageBar::resetCountdown()`
`320`	`320`	`void QgsMessageBar::updateItemCount()`
`321`	`321`	`{`
`322`	`322`	`mItemCount->setText( mItems.count() > 0 ? tr( "%n more", "unread messages", mItems.count() ) : QString( "" ) );`
	`323`	`+`
	`324`	`+ // do not show the down arrow for opening menu with "close all" if there is just one message`
	`325`	`+ mCloseBtn->setMenu( mItems.count() > 0 ? mCloseMenu : 0 );`
	`326`	`+ mCloseBtn->setPopupMode( mItems.count() > 0 ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup );`
`323`	`327`	`}`