Mercurial > hg > octave-nkf
comparison libgui/graphics/TextEdit.cc @ 20221:2535b9ffa2fc
Qt EditControl: do callback always on return pressed (Bug #44690)
* libgui/graphics/TextEdit.h
(returnPressed): new signal
* libgui/graphics/TextEdit.cpp
(TextEdit::keyPressEvent): emit returnPressed instread of editingFinished
* libgui/graphics/EditControl.cc
(EditControl::returnPressed): new function
(EditControl::EditControl): connect edit control returnPressed to our returnPressed.
author | John Donoghue |
---|---|
date | Wed, 01 Apr 2015 16:00:35 -0400 |
parents | f0e61a67ad9f |
children |
comparison
equal
deleted
inserted
replaced
20220:b08c13ed4a8c | 20221:2535b9ffa2fc |
---|---|
45 QTextEdit::keyPressEvent (xevent); | 45 QTextEdit::keyPressEvent (xevent); |
46 | 46 |
47 if ((xevent->key () == Qt::Key_Return | 47 if ((xevent->key () == Qt::Key_Return |
48 || xevent->key () == Qt::Key_Enter) | 48 || xevent->key () == Qt::Key_Enter) |
49 && xevent->modifiers () == Qt::ControlModifier) | 49 && xevent->modifiers () == Qt::ControlModifier) |
50 emit editingFinished (); | 50 emit returnPressed (); |
51 } | 51 } |
52 | 52 |
53 }; // namespace QtHandles | 53 }; // namespace QtHandles |