summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-04-23 14:05:29 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-23 14:07:15 (GMT)
commitaed9957d22a4fa2e64df08a0e5ddfdbf309f130a (patch)
treeee1bfdbffcdbd11ec23d3a5ed25eabd53e11c0c5 /Swift/QtUI/QtChatView.cpp
parent18f4f0ba13bbfe901dae44e95d869ba0425e93c7 (diff)
downloadswift-contrib-aed9957d22a4fa2e64df08a0e5ddfdbf309f130a.zip
swift-contrib-aed9957d22a4fa2e64df08a0e5ddfdbf309f130a.tar.bz2
Stop over-enlarging nested span elements in chat windows.
Resolves: #891
Diffstat (limited to 'Swift/QtUI/QtChatView.cpp')
-rw-r--r--Swift/QtUI/QtChatView.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index b0c4e09..4fa25ee 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -112,19 +112,19 @@ void QtChatView::addToDOM(boost::shared_ptr<ChatSnippet> snippet) {
continuationElement.replace(newElement);
} else {
continuationElement.removeFromDocument();
newInsertPoint_.prependOutside(newElement);
}
lastElement_ = newElement;
if (fontSizeSteps_ != 0) {
double size = 1.0 + 0.2 * fontSizeSteps_;
QString sizeString(QString().setNum(size, 'g', 3) + "em");
- const QWebElementCollection spans = lastElement_.findAll("span");
+ const QWebElementCollection spans = lastElement_.findAll("span.swift_resizable");
foreach (QWebElement span, spans) {
span.setStyleProperty("font-size", sizeString);
}
}
}
void QtChatView::addLastSeenLine() {
if (lineSeparator_.isNull()) {
lineSeparator_ = newInsertPoint_.clone();
@@ -251,19 +251,19 @@ void QtChatView::decreaseFontSize() {
}
emit fontResized(fontSizeSteps_);
}
void QtChatView::resizeFont(int fontSizeSteps) {
fontSizeSteps_ = fontSizeSteps;
double size = 1.0 + 0.2 * fontSizeSteps_;
QString sizeString(QString().setNum(size, 'g', 3) + "em");
//qDebug() << "Setting to " << sizeString;
- const QWebElementCollection spans = document_.findAll("span");
+ const QWebElementCollection spans = document_.findAll("span.swift_resizable");
foreach (QWebElement span, spans) {
span.setStyleProperty("font-size", sizeString);
}
webView_->setFontSizeIsMinimal(size == 1.0);
}
void QtChatView::resetView() {
lastElement_ = QWebElement();
QString pageHTML = theme_->getTemplate();