projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try workarounding bug #663 ("Teh Systray Heisenbug")
[quassel.git]
/
src
/
uisupport
/
multilineedit.cpp
diff --git
a/src/uisupport/multilineedit.cpp
b/src/uisupport/multilineedit.cpp
index
a79ef28
..
96fd43f
100644
(file)
--- a/
src/uisupport/multilineedit.cpp
+++ b/
src/uisupport/multilineedit.cpp
@@
-55,6
+55,7
@@
MultiLineEdit::MultiLineEdit(QWidget *parent)
#endif
setMode(SingleLine);
#endif
setMode(SingleLine);
+ setWordWrapEnabled(false);
reset();
connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
reset();
connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
@@
-65,7
+66,7
@@
MultiLineEdit::~MultiLineEdit() {
void MultiLineEdit::setCustomFont(const QFont &font) {
setFont(font);
void MultiLineEdit::setCustomFont(const QFont &font) {
setFont(font);
-
compu
teSizeHint();
+
upda
teSizeHint();
}
void MultiLineEdit::setMode(Mode mode) {
}
void MultiLineEdit::setMode(Mode mode) {
@@
-80,7
+81,7
@@
void MultiLineEdit::setMinHeight(int lines) {
return;
_minHeight = lines;
return;
_minHeight = lines;
-
compu
teSizeHint();
+
upda
teSizeHint();
}
void MultiLineEdit::setMaxHeight(int lines) {
}
void MultiLineEdit::setMaxHeight(int lines) {
@@
-88,10
+89,10
@@
void MultiLineEdit::setMaxHeight(int lines) {
return;
_maxHeight = lines;
return;
_maxHeight = lines;
-
compu
teSizeHint();
+
upda
teSizeHint();
}
}
-void MultiLineEdit::
enableScrollBars
(bool enable) {
+void MultiLineEdit::
setScrollBarsEnabled
(bool enable) {
if(_scrollBarsEnabled == enable)
return;
if(_scrollBarsEnabled == enable)
return;
@@
-114,11
+115,12
@@
void MultiLineEdit::updateScrollBars() {
}
void MultiLineEdit::resizeEvent(QResizeEvent *event) {
}
void MultiLineEdit::resizeEvent(QResizeEvent *event) {
- updateScrollBars();
QTextEdit::resizeEvent(event);
QTextEdit::resizeEvent(event);
+ updateSizeHint();
+ updateScrollBars();
}
}
-void MultiLineEdit::
compu
teSizeHint() {
+void MultiLineEdit::
upda
teSizeHint() {
QFontMetrics fm(font());
int minPixelHeight = fm.lineSpacing() * _minHeight;
int maxPixelHeight = fm.lineSpacing() * _maxHeight;
QFontMetrics fm(font());
int minPixelHeight = fm.lineSpacing() * _minHeight;
int maxPixelHeight = fm.lineSpacing() * _maxHeight;
@@
-142,7
+144,7
@@
void MultiLineEdit::computeSizeHint() {
QSize MultiLineEdit::sizeHint() const {
if(!_sizeHint.isValid()) {
MultiLineEdit *that = const_cast<MultiLineEdit *>(this);
QSize MultiLineEdit::sizeHint() const {
if(!_sizeHint.isValid()) {
MultiLineEdit *that = const_cast<MultiLineEdit *>(this);
- that->
compu
teSizeHint();
+ that->
upda
teSizeHint();
}
return _sizeHint;
}
}
return _sizeHint;
}
@@
-151,7
+153,7
@@
QSize MultiLineEdit::minimumSizeHint() const {
return sizeHint();
}
return sizeHint();
}
-void MultiLineEdit::
enableSpellCheck
(bool enable) {
+void MultiLineEdit::
setSpellCheckEnabled
(bool enable) {
#ifdef HAVE_KDE
setCheckSpellingEnabled(enable);
#else
#ifdef HAVE_KDE
setCheckSpellingEnabled(enable);
#else
@@
-159,6
+161,11
@@
void MultiLineEdit::enableSpellCheck(bool enable) {
#endif
}
#endif
}
+void MultiLineEdit::setWordWrapEnabled(bool enable) {
+ setLineWrapMode(enable? WidgetWidth : NoWrap);
+ updateSizeHint();
+}
+
void MultiLineEdit::historyMoveBack() {
addToHistory(text(), true);
void MultiLineEdit::historyMoveBack() {
addToHistory(text(), true);
@@
-311,7
+318,7
@@
void MultiLineEdit::on_textChanged() {
_lastDocumentHeight = document()->size().height();
on_documentHeightChanged(_lastDocumentHeight);
}
_lastDocumentHeight = document()->size().height();
on_documentHeightChanged(_lastDocumentHeight);
}
-
compu
teSizeHint();
+
upda
teSizeHint();
}
void MultiLineEdit::on_documentHeightChanged(qreal) {
}
void MultiLineEdit::on_documentHeightChanged(qreal) {