mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
fix(widget, contentdialog): Added reset icon after activate chat window
Fix #3139.
This commit is contained in:
parent
f2b8b10cc9
commit
4edc5996c7
|
@ -496,6 +496,7 @@ bool ContentDialog::event(QEvent* event)
|
||||||
g->getGroupWidget()->resetEventFlags();
|
g->getGroupWidget()->resetEventFlags();
|
||||||
g->getGroupWidget()->updateStatusLight();
|
g->getGroupWidget()->updateStatusLight();
|
||||||
}
|
}
|
||||||
|
Widget::getInstance()->resetIcon();
|
||||||
}
|
}
|
||||||
|
|
||||||
currentDialog = this;
|
currentDialog = this;
|
||||||
|
|
|
@ -1670,6 +1670,12 @@ void Widget::onEmptyGroupCreated(int groupId)
|
||||||
group->getGroupWidget()->editName();
|
group->getGroupWidget()->editName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Widget::resetIcon() {
|
||||||
|
eventIcon = false;
|
||||||
|
eventFlag = false;
|
||||||
|
updateIcons();
|
||||||
|
}
|
||||||
|
|
||||||
bool Widget::event(QEvent * e)
|
bool Widget::event(QEvent * e)
|
||||||
{
|
{
|
||||||
switch (e->type())
|
switch (e->type())
|
||||||
|
@ -1687,11 +1693,7 @@ bool Widget::event(QEvent * e)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eventFlag)
|
if (eventFlag)
|
||||||
{
|
resetIcon();
|
||||||
eventFlag = false;
|
|
||||||
eventIcon = false;
|
|
||||||
updateIcons();
|
|
||||||
}
|
|
||||||
|
|
||||||
focusChatInput();
|
focusChatInput();
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,9 @@ public:
|
||||||
void searchItem(GenericChatItemWidget* chatItem, GenericChatItemWidget::ItemType type);
|
void searchItem(GenericChatItemWidget* chatItem, GenericChatItemWidget::ItemType type);
|
||||||
bool groupsVisible() const;
|
bool groupsVisible() const;
|
||||||
|
|
||||||
|
// Used to reset the blinking icon
|
||||||
|
void resetIcon();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void onSettingsClicked();
|
void onSettingsClicked();
|
||||||
void onSeparateWindowClicked(bool separate);
|
void onSeparateWindowClicked(bool separate);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user