Browse Source

cleanup

pull/974/head
krepa098 11 years ago
parent
commit
b9dcb3bd9b
  1. 6
      src/chatlog/content/text.cpp
  2. 3
      src/chatlog/documentcache.cpp

6
src/chatlog/content/text.cpp

@ -222,12 +222,13 @@ void Text::regenerate() @@ -222,12 +222,13 @@ void Text::regenerate()
if(!doc)
{
doc = DocumentCache::getInstance().pop();
doc->setDefaultFont(defFont);
dirty = true;
}
if(dirty)
{
doc->setDefaultFont(defFont);
if(!elide)
doc->setHtml(text);
else
@ -238,9 +239,8 @@ void Text::regenerate() @@ -238,9 +239,8 @@ void Text::regenerate()
opt.setWrapMode(elide ? QTextOption::NoWrap : QTextOption::WrapAtWordBoundaryOrAnywhere);
doc->setDefaultTextOption(opt);
// width & layout
// width
doc->setTextWidth(width);
doc->documentLayout()->update();
// update ascent
if(doc->firstBlock().layout()->lineCount() > 0)

3
src/chatlog/documentcache.cpp

@ -34,7 +34,10 @@ QTextDocument* DocumentCache::pop() @@ -34,7 +34,10 @@ QTextDocument* DocumentCache::pop()
void DocumentCache::push(QTextDocument *doc)
{
if(doc)
{
doc->clear();
documents.push(doc);
}
}
DocumentCache &DocumentCache::getInstance()

Loading…
Cancel
Save