|
|
@ -311,7 +311,6 @@ void GenericChatForm::showEvent(QShowEvent*) |
|
|
|
bool GenericChatForm::event(QEvent* e) |
|
|
|
bool GenericChatForm::event(QEvent* e) |
|
|
|
{ |
|
|
|
{ |
|
|
|
// If the user accidentally starts typing outside of the msgEdit, focus it automatically
|
|
|
|
// If the user accidentally starts typing outside of the msgEdit, focus it automatically
|
|
|
|
|
|
|
|
|
|
|
|
if (e->type() == QEvent::KeyRelease && !msgEdit->hasFocus()) { |
|
|
|
if (e->type() == QEvent::KeyRelease && !msgEdit->hasFocus()) { |
|
|
|
QKeyEvent* ke = static_cast<QKeyEvent*>(e); |
|
|
|
QKeyEvent* ke = static_cast<QKeyEvent*>(e); |
|
|
|
if ((ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier) |
|
|
|
if ((ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier) |
|
|
@ -549,14 +548,16 @@ void GenericChatForm::disableSearchText() |
|
|
|
QVector<ChatLine::Ptr> lines = chatWidget->getLines(); |
|
|
|
QVector<ChatLine::Ptr> lines = chatWidget->getLines(); |
|
|
|
int numLines = lines.size(); |
|
|
|
int numLines = lines.size(); |
|
|
|
int index = numLines - searchPoint.x(); |
|
|
|
int index = numLines - searchPoint.x(); |
|
|
|
if (numLines > index) { |
|
|
|
if (index >= 0 && numLines > index) { |
|
|
|
ChatLine::Ptr l = lines[index]; |
|
|
|
ChatLine::Ptr l = lines[index]; |
|
|
|
|
|
|
|
if (l->getColumnCount() >= 2) { |
|
|
|
ChatLineContent* content = l->getContent(1); |
|
|
|
ChatLineContent* content = l->getContent(1); |
|
|
|
Text* text = static_cast<Text*>(content); |
|
|
|
Text* text = static_cast<Text*>(content); |
|
|
|
text->deselectText(); |
|
|
|
text->deselectText(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
bool GenericChatForm::searchInText(const QString& phrase, bool searchUp) |
|
|
|
bool GenericChatForm::searchInText(const QString& phrase, bool searchUp) |
|
|
|
{ |
|
|
|
{ |
|
|
|