mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Fixed tabbed chat with more than one friend.
With receive of a new chat message in an inactive tab the input focus was set to the input field of that inactive tab. The current tab was still visible, but the input has gone to the invisible tab. This is a bug in Qt. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
5dd70010ea
commit
b0aa255ead
@ -502,6 +502,7 @@ void PopupChatDialog::activate()
|
||||
if (window->isActiveWindow()) {
|
||||
newMessages = false;
|
||||
window->calculateTitle(this);
|
||||
focusDialog();
|
||||
}
|
||||
} else {
|
||||
newMessages = false;
|
||||
@ -733,8 +734,6 @@ void PopupChatDialog::sendChat()
|
||||
chatWidget->setCurrentCharFormat(QTextCharFormat ());
|
||||
|
||||
setFont();
|
||||
|
||||
/* redraw send list */
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -176,14 +176,13 @@ void PopupChatWindow::showDialog(PopupChatDialog *dialog, uint chatflags)
|
||||
activateWindow();
|
||||
setWindowState((windowState() & (~Qt::WindowMinimized)) | Qt::WindowActive);
|
||||
raise();
|
||||
dialog->focusDialog();
|
||||
} else {
|
||||
if (isVisible() == false) {
|
||||
showMinimized();
|
||||
}
|
||||
alertDialog(dialog);
|
||||
}
|
||||
|
||||
dialog->focusDialog();
|
||||
}
|
||||
|
||||
void PopupChatWindow::alertDialog(PopupChatDialog *dialog)
|
||||
|
Loading…
Reference in New Issue
Block a user