[Kst] branches/work/kst/1.5/kst/src/libkstapp

[Andrew Walker]

SVN commit 653135 by arwalker:

BUG:144048 Make legend respect font color

 M  +12 -0     kstviewlegend.cpp  


--- branches/work/kst/1.5/kst/src/libkstapp/kstviewlegend.cpp #653134:653135
@@ -245,6 +245,9 @@
       rc.x = 0;
       rc.y = _ascent;
       rc.xStart = rc.x;
+      if (_parsedTitle->chunk) {
+        _parsedTitle->chunk->attributes.color = foregroundColor();
+      }
       renderLabel(rc, _parsedTitle->chunk, _vectorsUsed, _scalarsUsed, _stringsUsed);
       i = 1;
       p.restore();
@@ -260,6 +263,9 @@
         rc.x = 0;
         rc.y = _ascent;
         rc.xStart = rc.x;
+        if ((*it)->parsedLegendTag()->chunk) {
+          (*it)->parsedLegendTag()->chunk->attributes.color = foregroundColor();
+        }
         renderLabel(rc, (*it)->parsedLegendTag()->chunk, _vectorsUsed, _scalarsUsed, _stringsUsed);
       }
       p.restore();
@@ -272,6 +278,9 @@
       rc.x = 0;
       rc.y = _ascent;
       rc.xStart = rc.x;
+      if (_parsedTitle->chunk) {
+        _parsedTitle->chunk->attributes.color = foregroundColor();
+      }
       renderLabel(rc, _parsedTitle->chunk, _vectorsUsed, _scalarsUsed, _stringsUsed);
       p.translate(_titleWidth + _ascent,0);
     }
@@ -285,6 +294,9 @@
         rc.x = 0;
         rc.y = _ascent;
         rc.xStart = rc.x;
+        if ((*it)->parsedLegendTag()->chunk) {
+          (*it)->parsedLegendTag()->chunk->attributes.color = foregroundColor();
+        }
         renderLabel(rc, (*it)->parsedLegendTag()->chunk, _vectorsUsed, _scalarsUsed, _stringsUsed);
         p.translate((*it)->legendLabelSize().width() + _ascent,0);
       }