comparison changesetitem.cpp @ 56:1394c8cbf991

* Minor layout improvement

 
     int width = 100;
     if (m_wide) width = 180;
     int x0 = -((width - 50) / 2 - 1);
 
-    QRectF r(x0, 0, width - 3, 49);
+    int height = 49;
+    QRectF r(x0, 0, width - 3, height);
     paint->drawRect(r);
 
     if (scale < 0.1) {
 	paint->restore();
 	return;
-    }
-
-    if (m_changeset->children().empty()) {
-	f.setBold(true);
-	paint->setFont(f);
-	QString branch = m_changeset->branch();
-	int wid = width - 3;
-	branch = TextAbbrev::abbreviate(branch, QFontMetrics(f), wid);
-	paint->drawText(x0, -fh + fm.ascent() - 4, branch);
-	f.setBold(false);
     }
 
     paint->fillRect(QRectF(x0 + 0.5, 0.5, width - 4, fh - 0.5),
 		    QBrush(userColour));
 

     QString person = TextAbbrev::abbreviate(m_changeset->authorName(), fm, wid);
     paint->drawText(x0 + 3, fm.ascent(), person);
 
     paint->setPen(QPen(Qt::black));
 
-    f.setItalic(true);
+    if (m_changeset->children().empty()) {
+	// write branch name
+	f.setBold(true);
+	paint->setFont(f);
+	QString branch = m_changeset->branch();
+	int wid = width - 3;
+	branch = TextAbbrev::abbreviate(branch, QFontMetrics(f), wid);
+	paint->drawText(x0, -fh + fm.ascent() - 4, branch);
+	f.setBold(false);
+    }
+
+//    f.setItalic(true);
     fm = QFontMetrics(f);
     fh = fm.height();
     paint->setFont(f);
 
     QString comment = m_changeset->comment().trimmed();

     comment = comment.replace(QRegExp("\"$"), "");
     comment = comment.replace("\\\"", "\"");
     comment = comment.split('\n')[0];
 
     wid = width - 5;
+    int nlines = (height / fh) - 1;
+    if (nlines < 1) nlines = 1;
     comment = TextAbbrev::abbreviate(comment, fm, wid, TextAbbrev::ElideEnd,
-				     "...", 2);
+				     "...", nlines);
 
     QStringList lines = comment.split('\n');
     for (int i = 0; i < lines.size(); ++i) {
 	paint->drawText(x0 + 3, i * fh + fh + fm.ascent(), lines[i].trimmed());
     }