fix(widget, contentdialog): Added reset icon after activate chat window

Fix #3139.
qTox · Apr 23, 2016 · 4edc599 · 4edc599
1 parent f2b8b10
commit 4edc599
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -105,6 +105,9 @@ class Widget final : public QMainWindow
     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);