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 branch 'pr2688'

Browse Source
This commit is contained in:
tux3 2015-12-15 19:48:29 +01:00
commit 0c2f70eb7e
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/widget/widget.cpp
View File

@ -1226,8 +1226,11 @@ bool Widget::newMessageAlert(QWidget* currentWindow, bool isActive, bool sound,
if (notify) if (notify)
{ {
QApplication::alert(currentWindow); if (inactiveWindow)
eventFlag = true; {
QApplication::alert(currentWindow);
eventFlag = true;
}
if (Settings::getInstance().getShowWindow()) if (Settings::getInstance().getShowWindow())
{ {
@ -1577,6 +1580,10 @@ bool Widget::event(QEvent * e)
{ {
switch (e->type()) switch (e->type())
{ {
case QEvent::MouseButtonPress:
case QEvent::MouseButtonDblClick:
focusChatInput();
break;
case QEvent::WindowActivate: case QEvent::WindowActivate:
if (activeChatroomWidget != nullptr) if (activeChatroomWidget != nullptr)
{ {
@ -1584,6 +1591,7 @@ bool Widget::event(QEvent * e)
activeChatroomWidget->updateStatusLight(); activeChatroomWidget->updateStatusLight();
setWindowTitle(activeChatroomWidget->getTitle()); setWindowTitle(activeChatroomWidget->getTitle());
} }
if (eventFlag) if (eventFlag)
{ {
eventFlag = false; eventFlag = false;
@ -1591,13 +1599,15 @@ bool Widget::event(QEvent * e)
updateIcons(); updateIcons();
} }
focusChatInput();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
emit windowStateChanged(windowState()); emit windowStateChanged(windowState());
case QEvent::WindowStateChange: case QEvent::WindowStateChange:
Nexus::getInstance().updateWindowsStates(); Nexus::getInstance().updateWindowsStates();
#endif #endif
break;
default: default:
break; break;
} }
@ -2080,3 +2090,14 @@ void Widget::retranslateUi()
previousConversationAction->setText(tr("Previous Conversation")); previousConversationAction->setText(tr("Previous Conversation"));
#endif #endif
} }
void Widget::focusChatInput()
{
if (activeChatroomWidget)
{
if (Friend* f = activeChatroomWidget->getFriend())
f->getChatForm()->focusInput();
else if (Group* g = activeChatroomWidget->getGroup())
g->getChatForm()->focusInput();
}
}

1
src/widget/widget.h
View File

@ -221,6 +221,7 @@ private:
static bool filterOnline(int index); static bool filterOnline(int index);
static bool filterOffline(int index); static bool filterOffline(int index);
void retranslateUi(); void retranslateUi();
void focusChatInput();
private: private:
SystemTrayIcon *icon; SystemTrayIcon *icon;