From 8c83d32da5b49e2c7a9601f39b68e3f932bf122f Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Sun, 16 Jul 2017 22:11:26 +0200 Subject: [PATCH] feat(MessagesCountNotifier): limit counter to 99 --- src/components/core/MessagesCountNotifier.cpp | 11 ++++++----- src/components/core/MessagesCountNotifier.hpp | 2 +- src/components/core/MessagesCountNotifierMacOS.h | 3 +-- src/components/core/MessagesCountNotifierMacOS.m | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/components/core/MessagesCountNotifier.cpp b/src/components/core/MessagesCountNotifier.cpp index beb69752b..2ae5d4669 100644 --- a/src/components/core/MessagesCountNotifier.cpp +++ b/src/components/core/MessagesCountNotifier.cpp @@ -22,15 +22,15 @@ #include "../core/CoreManager.hpp" -#include "MessagesCountNotifier.hpp" - #if defined(Q_OS_LINUX) // TODO. #elif defined(Q_OS_MACOS) #include "MessagesCountNotifierMacOS.h" #elif defined(Q_OS_WIN) // TODO. -#endif +#endif // if defined(Q_OS_LINUX) + +#include "MessagesCountNotifier.hpp" using namespace std; @@ -62,14 +62,15 @@ void MessagesCountNotifier::updateUnreadMessagesCount () { void MessagesCountNotifier::notifyUnreadMessagesCount () { qInfo() << QStringLiteral("Notify unread messages count: %1.").arg(mUnreadMessagesCount); + int count = mUnreadMessagesCount > 99 ? 99 : mUnreadMessagesCount; #if defined(Q_OS_LINUX) // TODO. #elif defined(Q_OS_MACOS) - ::notifyUnreadMessagesCountMacOS(mUnreadMessagesCount); + ::notifyUnreadMessagesCountMacOS(count); #elif defined(Q_OS_WIN) // TODO. - #endif + #endif // if defined(Q_OS_LINUX) } // ----------------------------------------------------------------------------- diff --git a/src/components/core/MessagesCountNotifier.hpp b/src/components/core/MessagesCountNotifier.hpp index 0677bbe20..67c37d452 100644 --- a/src/components/core/MessagesCountNotifier.hpp +++ b/src/components/core/MessagesCountNotifier.hpp @@ -27,7 +27,7 @@ // ============================================================================= namespace linphone { - class ChatMessage; +class ChatMessage; } class ChatModel; diff --git a/src/components/core/MessagesCountNotifierMacOS.h b/src/components/core/MessagesCountNotifierMacOS.h index c49c3666f..8967973fd 100644 --- a/src/components/core/MessagesCountNotifierMacOS.h +++ b/src/components/core/MessagesCountNotifierMacOS.h @@ -22,5 +22,4 @@ // ============================================================================= -extern "C" void notifyUnreadMessagesCountMacOS(int count); - +extern "C" void notifyUnreadMessagesCountMacOS (int count); diff --git a/src/components/core/MessagesCountNotifierMacOS.m b/src/components/core/MessagesCountNotifierMacOS.m index 940c27ada..4483bbece 100644 --- a/src/components/core/MessagesCountNotifierMacOS.m +++ b/src/components/core/MessagesCountNotifierMacOS.m @@ -28,4 +28,3 @@ void notifyUnreadMessagesCountMacOS(int count) { NSString *badgeStr = (count > 0) ? [NSString stringWithFormat:@"%d", count] : @""; [[NSApp dockTile] setBadgeLabel:badgeStr]; } -