Move part name text to bottom to accommodate drum 'slivers'

2 files changed, 12 insertions, 5 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 6378495e..3a160786 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,5 +1,7 @@
 15.04.2011:
         - And while we're at it... Invert drum track 'slivers' in arranger parts. (Tim)
+        - Move part name text to bottom to accommodate drum 'slivers'. 
+          Use lowest gradient colour from new gGradientFromQColor(), to determine whether to invert.
 14.04.2011:
         - Fixed notes 'sliver' drawing in arranger midi parts. Invert if too dark. (Tim)
         - Gave arranger part name text drawing a shadow to help contrast with drawn events. 
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 57cccbf7..e2c2b32d 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1610,15 +1610,20 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
             // draw name
             // FN: Set text color depending on part color (black / white)
             int part_r, part_g, part_b, brightness;
-            config.partColors[i].getRgb(&part_r, &part_g, &part_b);
+            //config.partColors[i].getRgb(&part_r, &part_g, &part_b);
+            // Since we'll draw the text on the bottom (to accommodate drum 'slivers'),
+            //  get the lowest colour in the gradient used to draw the part.
+            QRect rr = map(r);
+            rr.setX(rr.x() + 3);
+            gGradientFromQColor(config.partColors[i], rr.topLeft(), rr.bottomLeft()).stops().last().second.getRgb(&part_r, &part_g, &part_b);
             brightness =  part_r*29 + part_g*59 + part_b*12;
             //if (brightness < 12000 || part->selected())
             //  p.setPen(Qt::white);   /* too dark: use white for text color */
             //else
             //  p.setPen(Qt::black);  /* otherwise use black */
             bool rev = brightness < 12000 || part->selected();
-            QRect rr = map(r);
-            rr.setX(rr.x() + 3);
+            //QRect rr = map(r);
+            //rr.setX(rr.x() + 3);
             p.save();
             p.setFont(config.fonts[1]);
             p.setWorldMatrixEnabled(false);
@@ -1626,12 +1631,12 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
               p.setPen(Qt::black);   
             else
               p.setPen(Qt::white); 
-            p.drawText(rr.translated(1, 1), Qt::AlignTop|Qt::AlignLeft, part->name());
+            p.drawText(rr.translated(1, 1), Qt::AlignBottom|Qt::AlignLeft, part->name());
             if (rev)
               p.setPen(Qt::white);   
             else
               p.setPen(Qt::black);  
-            p.drawText(rr, Qt::AlignTop|Qt::AlignLeft, part->name());
+            p.drawText(rr, Qt::AlignBottom|Qt::AlignLeft, part->name());
             p.restore();
             }
       }