jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue with clicking on PM bubbles

Browse source 
Previously would not open the client if the window was minimized.
Added the same popup fix for mentions
This commit is contained in:
Matt Lowe 2015-04-07 23:09:51 +02:00
parent c07ec9aa23
commit 6b307469fe
9 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/tab_message.cpp
View file

@ -118,9 +118,8 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
}
bool TabMessage::shouldShowSystemPopup(const Event_UserMessage &event) {
return (event.sender_name() == otherUserInfo->name() &&
tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)) ||
QApplication::activeWindow() == 0 || QApplication::focusWidget() == 0;
return (QApplication::activeWindow() == 0 || QApplication::focusWidget() == 0 ||
event.sender_name() == otherUserInfo->name() && tabSupervisor->currentIndex() != tabSupervisor->indexOf(this));
}
void TabMessage::showSystemPopup(const Event_UserMessage &event) {
@ -132,6 +131,7 @@ void TabMessage::showSystemPopup(const Event_UserMessage &event) {
void TabMessage::messageClicked() {
tabSupervisor->setCurrentIndex(tabSupervisor->indexOf(this));
QApplication::setActiveWindow(this);
emit maximizeClient();
}
void TabMessage::processUserLeft()