Changeset ff579df

Timestamp:

08/18/21 20:23:47 (5 months ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

763b877

Parents:

4523005

Message:

Remaining fix of bug Debian BTS #992236 (line distance).

​https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992236

File:

• src/mvc/delegate.cpp (modified) (3 diffs)

src/mvc/delegate.cpp

@@ -89 +89 @@
         fontSmall.setPixelSize(aux*0.2);
         QFontMetrics fmSmall(fontSmall);
+
         // font SMALL bold
         QFont fontSmallB = fontSmall;
@@ -152 +153 @@
         QTime start = conference.shiftTime(event->start().time());
         painter->setFont(fontBig);
-        painter->drawText(titlePointF,start.toString("hh:mm") + "-" + start.addSecs(event->duration()).toString("hh:mm") + ", " + event->roomName());
+        painter->drawText(titlePointF, start.toString("hh:mm") + "-" + start.addSecs(event->duration()).toString("hh:mm") + ", " + event->roomName());
 
         // title
-        titlePointF.setY(titlePointF.y()+fmBig.height()-fmBig.descent());
+        titlePointF.setY(titlePointF.y() + fmBig.lineSpacing());
         painter->setFont(fontBigB);
         QString title = event->title();
@@ -172 +173 @@
             title += "...";
         }
-        painter->drawText(titlePointF,title);
+        painter->drawText(titlePointF, title);
 
         // persons
-        titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());
+        titlePointF.setY(titlePointF.y() + fmBigB.descent() + fmSmall.lineSpacing());
         painter->setFont(fontSmall);
         QString presenterPrefix = event->persons().count() < 2 ? "Presenter" : "Presenters";
-        painter->drawText(titlePointF,presenterPrefix + ": " + event->persons().join(" and "));
+        painter->drawText(titlePointF, presenterPrefix + ": " + event->persons().join(" and "));
 
         // track
-        titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());
-        painter->drawText(titlePointF,"Track: " + Track::retrieveTrackName(event->trackId()));
+        titlePointF.setY(titlePointF.y() + fmSmall.lineSpacing());
+        painter->drawText(titlePointF, "Track: " + Track::retrieveTrackName(event->trackId()));
     }