From 4edc5996c74d8679c270c50328642665ed6b3aed Mon Sep 17 00:00:00 2001 From: Diadlo Date: Sat, 23 Apr 2016 02:13:00 +0300 Subject: [PATCH] fix(widget, contentdialog): Added reset icon after activate chat window Fix #3139. --- src/widget/contentdialog.cpp | 1 + src/widget/widget.cpp | 12 +++++++----- src/widget/widget.h | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp index 28928526f..00f4c9d4a 100644 --- a/src/widget/contentdialog.cpp +++ b/src/widget/contentdialog.cpp @@ -496,6 +496,7 @@ bool ContentDialog::event(QEvent* event) g->getGroupWidget()->resetEventFlags(); g->getGroupWidget()->updateStatusLight(); } + Widget::getInstance()->resetIcon(); } currentDialog = this; diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 6253ca5ec..c40ba4ef9 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -1670,6 +1670,12 @@ void Widget::onEmptyGroupCreated(int groupId) group->getGroupWidget()->editName(); } +void Widget::resetIcon() { + eventIcon = false; + eventFlag = false; + updateIcons(); +} + bool Widget::event(QEvent * e) { switch (e->type()) @@ -1687,11 +1693,7 @@ bool Widget::event(QEvent * e) } if (eventFlag) - { - eventFlag = false; - eventIcon = false; - updateIcons(); - } + resetIcon(); focusChatInput(); diff --git a/src/widget/widget.h b/src/widget/widget.h index c671c5db5..478a633ed 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -105,6 +105,9 @@ public: void searchItem(GenericChatItemWidget* chatItem, GenericChatItemWidget::ItemType type); bool groupsVisible() const; + // Used to reset the blinking icon + void resetIcon(); + public slots: void onSettingsClicked(); void onSeparateWindowClicked(bool separate);