StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3180

Browse Source 
Diadlo (1):
      fix(widget, contentdialog): Added reset icon after activate chat window
This commit is contained in:
sudden6 2016-04-24 14:06:08 +02:00
commit 28cecadbc4
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widget/contentdialog.cpp
View File

@ -496,6 +496,7 @@ bool ContentDialog::event(QEvent* event)
g->getGroupWidget()->resetEventFlags();
g->getGroupWidget()->updateStatusLight();
}
Widget::getInstance()->resetIcon();
}
currentDialog = this;

12
src/widget/widget.cpp
View File

@ -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();

3
src/widget/widget.h
View File

@ -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);