Swiftdiff options
| author | Cătălin Badea <catalin.badea392@gmail.com> | 2012-08-09 18:53:26 (GMT) |
|---|---|---|
| committer | Cătălin Badea <catalin.badea392@gmail.com> | 2012-08-09 18:53:26 (GMT) |
| commit | 62f2c451de60255b37d695076fa4ef780cd3c516 (patch) | |
| tree | 6dec2afcbbfe827633a0bcdb40db59389bdf81ac /Swift/QtUI/QtChatView.cpp | |
| parent | a3c71dd9b0597efbef18c23b797919863595d170 (diff) | |
| download | swift-contrib-62f2c451de60255b37d695076fa4ef780cd3c516.zip swift-contrib-62f2c451de60255b37d695076fa4ef780cd3c516.tar.bz2 | |
Fix highlighting and disable scrollToBottom in the history dialog.
Diffstat (limited to 'Swift/QtUI/QtChatView.cpp')
| -rw-r--r-- | Swift/QtUI/QtChatView.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp index 05e2191..83f6092 100644 --- a/Swift/QtUI/QtChatView.cpp +++ b/Swift/QtUI/QtChatView.cpp @@ -28,7 +28,7 @@ namespace Swift { -QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent, bool disableAutoScroll) : QWidget(parent), fontSizeSteps_(0) { +QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent, bool disableAutoScroll) : QWidget(parent), fontSizeSteps_(0), disableAutoScroll_(disableAutoScroll) { theme_ = theme; QVBoxLayout* mainLayout = new QVBoxLayout(this); @@ -291,11 +291,9 @@ void QtChatView::handleFrameSizeChanged() { topMessageAdded_ = false; } - if (isAtBottom_) { + if (isAtBottom_ && !disableAutoScroll_) { scrollToBottom(); } - - emit contentSizeChanged(); } void QtChatView::handleLinkClicked(const QUrl& url) { @@ -468,8 +466,4 @@ void QtChatView::resetTopInsertPoint() { firstElement_ = QWebElement(); } -bool QtChatView::findText(const QString& text, QWebPage::FindFlags options) { - return webPage_->findText(text, options); -} - } |