History

Merge pull request #3357 from huffman/19968

Code Review for Job #19968

Brad Hefta-Gaub committed 12 years ago

Commit d342f922 parents 2f22292 2b5759b4 files · +27 −75Browse files

Showing the changes to interface/src/Menu.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Menu.cpp+5−0
@@ -1468,7 +1468,9 @@ void Menu::showChat() { · 1467 unmodified lines
1468 if (_chatWindow->isHidden()) {1468 if (_chatWindow->isHidden()) {
1469 _chatWindow->show();1469 _chatWindow->show();
1470 }1470 }
1471 _chatWindow->raise();
1471 _chatWindow->activateWindow();1472 _chatWindow->activateWindow();
1473 _chatWindow->setFocus();
1472 } else {1474 } else {
1473 Application::getInstance()->getTrayIcon()->showMessage("Interface", "You need to login to be able to chat with others on this domain.");1475 Application::getInstance()->getTrayIcon()->showMessage("Interface", "You need to login to be able to chat with others on this domain.");
1474 }1476 }
@@ -1480,6 +1482,9 @@ void Menu::toggleChat() { · 5 unmodified lines
1480 if (!_chatAction->isEnabled() && _chatWindow && AccountManager::getInstance().isLoggedIn()) {1482 if (!_chatAction->isEnabled() && _chatWindow && AccountManager::getInstance().isLoggedIn()) {
1481 if (_chatWindow->isHidden()) {1483 if (_chatWindow->isHidden()) {
1482 _chatWindow->show();1484 _chatWindow->show();
1485 _chatWindow->raise();
1486 _chatWindow->activateWindow();
1487 _chatWindow->setFocus();
1483 } else {1488 } else {
1484 _chatWindow->hide();1489 _chatWindow->hide();
1485 }1490 }