chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed enter keypress for proper handling

Browse Source
This commit is contained in:
Jordan Sherer 2019-11-15 10:18:19 -05:00
parent ba3e521cf3
commit a1ad346cea
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TransmitTextEdit.cpp
View File

@ -247,6 +247,7 @@ void TransmitTextEdit::on_textContentsChanged(int /*pos*/, int rem, int add){
std::copy_if(normalized.begin(), normalized.end(), std::back_inserter(result), [](QChar& c) { std::copy_if(normalized.begin(), normalized.end(), std::back_inserter(result), [](QChar& c) {
return c.toLatin1() != 0 && (c == 10 || (c > 31 && c < 128)); return c.toLatin1() != 0 && (c == 10 || (c > 31 && c < 128));
}); });
if(result != text){ if(result != text){
bool blocked = signalsBlocked(); bool blocked = signalsBlocked();
blockSignals(true); blockSignals(true);
@ -441,7 +442,11 @@ bool TransmitTextEdit::eventFilter(QObject */*o*/, QEvent *e){
// -1. don't filter the escape key, return key, or enter key here // -1. don't filter the escape key, return key, or enter key here
QKeyEvent *k = static_cast<QKeyEvent *>(e); QKeyEvent *k = static_cast<QKeyEvent *>(e);
if(k->key() == Qt::Key_Escape || k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter){ if(k->key() == Qt::Key_Escape){
return false;
}
if(k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter){
return false; return false;
} }

3
mainwindow.cpp
View File

@ -980,7 +980,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
auto enterFilter = new EnterKeyPressEater(); auto enterFilter = new EnterKeyPressEater();
connect(enterFilter, &EnterKeyPressEater::enterKeyPressed, this, [this](QObject *, QKeyEvent *, bool *pProcessed){ connect(enterFilter, &EnterKeyPressEater::enterKeyPressed, this, [this](QObject *, QKeyEvent *, bool *pProcessed){
if(QApplication::keyboardModifiers() & Qt::ShiftModifier){ if(QApplication::keyboardModifiers() & Qt::ShiftModifier){
if(pProcessed) *pProcessed = false; // do not allow shift+enter
if(pProcessed) *pProcessed = true;
return; return;
} }
if(ui->extFreeTextMsgEdit->isReadOnly()){ if(ui->extFreeTextMsgEdit->isReadOnly()){