* Don't show scrollbars in single line mode
* Don't update geometry more often than necessary
* Allow selecting text with shift + up/down
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+ MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
+ if(!inputLine)
+ return false;
+
// Intercept copy key presses
if(keyEvent == QKeySequence::Copy) {
// Intercept copy key presses
if(keyEvent == QKeySequence::Copy) {
- MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
- if(!inputLine)
- return false;
if(inputLine->hasSelectedText())
return false;
ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if(inputLine->hasSelectedText())
return false;
ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ // We don't want to steal cursor movement keys if the input line is in multiline mode
+ if(!inputLine->isSingleLine())
+ return false;
+
switch(keyEvent->key()) {
case Qt::Key_Up:
case Qt::Key_Down:
switch(keyEvent->key()) {
case Qt::Key_Up:
case Qt::Key_Down:
void InputWidget::updateEnabledState() {
QModelIndex currentIndex = selectionModel()->currentIndex();
void InputWidget::updateEnabledState() {
QModelIndex currentIndex = selectionModel()->currentIndex();
const Network *net = Client::networkModel()->networkByIndex(currentIndex);
bool enabled = false;
if(net) {
const Network *net = Client::networkModel()->networkByIndex(currentIndex);
bool enabled = false;
if(net) {
#endif
idx(0),
_mode(SingleLine),
#endif
idx(0),
_mode(SingleLine),
- _wrapMode(QTextOption::NoWrap),
- _numLines(1),
_minHeight(1),
_maxHeight(5),
_scrollBarsEnabled(true),
_minHeight(1),
_maxHeight(5),
_scrollBarsEnabled(true),
#endif
setAcceptRichText(false);
#endif
setAcceptRichText(false);
- setWordWrapMode(QTextOption::NoWrap);
#ifdef HAVE_KDE
enableFindReplace(false);
#endif
#ifdef HAVE_KDE
enableFindReplace(false);
#endif
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
reset();
connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
reset();
connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
void MultiLineEdit::setCustomFont(const QFont &font) {
setFont(font);
void MultiLineEdit::setCustomFont(const QFont &font) {
setFont(font);
}
void MultiLineEdit::setMode(Mode mode) {
}
void MultiLineEdit::setMode(Mode mode) {
-void MultiLineEdit::setWrapMode(QTextOption::WrapMode wrapMode) {
- if(_wrapMode == wrapMode)
- return;
-
- _wrapMode = wrapMode;
- setWordWrapMode(wrapMode);
-}
-
void MultiLineEdit::setMinHeight(int lines) {
if(lines == _minHeight)
return;
_minHeight = lines;
void MultiLineEdit::setMinHeight(int lines) {
if(lines == _minHeight)
return;
_minHeight = lines;
}
void MultiLineEdit::setMaxHeight(int lines) {
}
void MultiLineEdit::setMaxHeight(int lines) {
return;
_maxHeight = lines;
return;
_maxHeight = lines;
}
void MultiLineEdit::enableScrollBars(bool enable) {
}
void MultiLineEdit::enableScrollBars(bool enable) {
return;
_scrollBarsEnabled = enable;
return;
_scrollBarsEnabled = enable;
- if(enable && numLines() > 1) {
- // the vertical scrollbar must be enabled/disabled manually;
- // ScrollBarAsNeeded leads to flicker because of the dynamic widget resize
- setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- } else {
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- }
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
else
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
else
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+ if(!_scrollBarsEnabled || isSingleLine())
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ else
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
}
void MultiLineEdit::resizeEvent(QResizeEvent *event) {
}
void MultiLineEdit::resizeEvent(QResizeEvent *event) {
QTextEdit::resizeEvent(event);
}
QTextEdit::resizeEvent(event);
}
-QSize MultiLineEdit::sizeHint() const {
+void MultiLineEdit::computeSizeHint() {
- int _minPixelHeight = fm.lineSpacing() * _minHeight;
- int _maxPixelHeight = fm.lineSpacing() * _maxHeight;
+ int minPixelHeight = fm.lineSpacing() * _minHeight;
+ int maxPixelHeight = fm.lineSpacing() * _maxHeight;
+ int scrollBarHeight = horizontalScrollBar()->isVisible() ? horizontalScrollBar()->height() : 0;
// use the style to determine a decent size
// use the style to determine a decent size
- int h = qMin(qMax((int)document()->size().height(), _minPixelHeight), _maxPixelHeight) + 2 * frameWidth();
+ int h = qMin(qMax((int)document()->size().height() + scrollBarHeight, minPixelHeight), maxPixelHeight) + 2 * frameWidth();
QStyleOptionFrameV2 opt;
opt.initFrom(this);
opt.rect = QRect(0, 0, 100, h);
QStyleOptionFrameV2 opt;
opt.initFrom(this);
opt.rect = QRect(0, 0, 100, h);
opt.midLineWidth = midLineWidth();
opt.state |= QStyle::State_Sunken;
QSize s = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(100, h).expandedTo(QApplication::globalStrut()), this);
opt.midLineWidth = midLineWidth();
opt.state |= QStyle::State_Sunken;
QSize s = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(100, h).expandedTo(QApplication::globalStrut()), this);
+ if(s != _sizeHint) {
+ _sizeHint = s;
+ updateGeometry();
+ }
+}
+
+QSize MultiLineEdit::sizeHint() const {
+ if(!_sizeHint.isValid()) {
+ MultiLineEdit *that = const_cast<MultiLineEdit *>(this);
+ that->computeSizeHint();
+ }
+ return _sizeHint;
}
QSize MultiLineEdit::minimumSizeHint() const {
}
QSize MultiLineEdit::minimumSizeHint() const {
- case Qt::Key_Up: {
- event->accept();
- if(!(event->modifiers() & Qt::ControlModifier)) {
- int pos = textCursor().position();
- moveCursor(QTextCursor::Up);
- if(pos == textCursor().position()) // already on top line -> history
+ case Qt::Key_Up:
+ if(event->modifiers() & Qt::ShiftModifier)
+ break;
+ {
+ event->accept();
+ if(!(event->modifiers() & Qt::ControlModifier)) {
+ int pos = textCursor().position();
+ moveCursor(QTextCursor::Up);
+ if(pos == textCursor().position()) // already on top line -> history
+ historyMoveBack();
+ } else
- } else
- historyMoveBack();
- break;
- }
- case Qt::Key_Down: {
- event->accept();
- if(!(event->modifiers() & Qt::ControlModifier)) {
- int pos = textCursor().position();
- moveCursor(QTextCursor::Down);
- if(pos == textCursor().position()) // already on bottom line -> history
+ case Qt::Key_Down:
+ if(event->modifiers() & Qt::ShiftModifier)
+ break;
+ {
+ event->accept();
+ if(!(event->modifiers() & Qt::ControlModifier)) {
+ int pos = textCursor().position();
+ moveCursor(QTextCursor::Down);
+ if(pos == textCursor().position()) // already on bottom line -> history
+ historyMoveForward();
+ } else
- } else
- historyMoveForward();
- break;
- }
case Qt::Key_Return:
case Qt::Key_Enter:
case Qt::Key_Select:
event->accept();
on_returnPressed();
case Qt::Key_Return:
case Qt::Key_Enter:
case Qt::Key_Select:
event->accept();
on_returnPressed();
- // We don't want to have the tab key react if no completer is installed
+ // We don't want to have the tab key react even if no completer is installed
case Qt::Key_Tab:
event->accept();
case Qt::Key_Tab:
event->accept();
- KTextEdit::keyPressEvent(event);
+ KTextEdit::keyPressEvent(event);
- QTextEdit::keyPressEvent(event);
+ QTextEdit::keyPressEvent(event);
}
void MultiLineEdit::on_returnPressed() {
}
void MultiLineEdit::on_returnPressed() {
if(_mode == SingleLine)
newText.replace('\n', ' ');
if(_mode == SingleLine)
newText.replace('\n', ' ');
+ _singleLine = (newText.indexOf('\n') < 0);
+
if(document()->size().height() != _lastDocumentHeight) {
_lastDocumentHeight = document()->size().height();
on_documentHeightChanged(_lastDocumentHeight);
}
if(document()->size().height() != _lastDocumentHeight) {
_lastDocumentHeight = document()->size().height();
on_documentHeightChanged(_lastDocumentHeight);
}
}
void MultiLineEdit::on_documentHeightChanged(qreal) {
}
void MultiLineEdit::on_documentHeightChanged(qreal) {
QTextBlockFormat format = textCursor().blockFormat();
format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
textCursor().setBlockFormat(format);
QTextBlockFormat format = textCursor().blockFormat();
format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
textCursor().setBlockFormat(format);
}
void MultiLineEdit::showHistoryEntry() {
}
void MultiLineEdit::showHistoryEntry() {
cursor.setBlockFormat(format);
cursor.movePosition(QTextCursor::End);
setTextCursor(cursor);
cursor.setBlockFormat(format);
cursor.movePosition(QTextCursor::End);
setTextCursor(cursor);
inline void insert(const QString &newText) { insertPlainText(newText); }
inline void backspace() { keyPressEvent(new QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier)); }
inline bool hasSelectedText() { return textCursor().hasSelection(); }
inline void insert(const QString &newText) { insertPlainText(newText); }
inline void backspace() { keyPressEvent(new QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier)); }
inline bool hasSelectedText() { return textCursor().hasSelection(); }
+ inline bool isSingleLine() const { return _singleLine; }
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
public slots:
void setMode(Mode mode);
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
public slots:
void setMode(Mode mode);
- void setWrapMode(QTextOption::WrapMode = QTextOption::NoWrap);
void setMinHeight(int numLines);
void setMaxHeight(int numLines);
void enableScrollBars(bool enable = true);
void setMinHeight(int numLines);
void setMaxHeight(int numLines);
void enableScrollBars(bool enable = true);
QHash<int, QString> tempHistory;
qint32 idx;
Mode _mode;
QHash<int, QString> tempHistory;
qint32 idx;
Mode _mode;
- QTextOption::WrapMode _wrapMode;
- int _numLines;
int _minHeight;
int _maxHeight;
bool _scrollBarsEnabled;
int _minHeight;
int _maxHeight;
bool _scrollBarsEnabled;
void reset();
void showHistoryEntry();
void updateScrollBars();
void reset();
void showHistoryEntry();
void updateScrollBars();
-
- inline int numLines() const { return _numLines; }
- void setNumLines(int);
+ void computeSizeHint();