HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1760:10a2cce6b5a9

BarSet label brush is no longer reset to theme default brush if it was preset earlier

Marek Rosa -

r1760:10a2cce6b5a9

parent child

Context file:

r1760:10a2cce6b5a9

src/barchart/qbarset.cpp +4 0

              */
              void QBarSet::setLabelColor(QColor color)
              {
+                 QBrush defaultBrush;
                  QBrush b = labelBrush();
+                 if (b == defaultBrush)
+                     b.setStyle(Qt::SolidPattern);
                  if (b.color() != color) {
                      b.setColor(color);
                      setLabelBrush(b);

src/charttheme.cpp +2 0

                      // Pick label color from the opposite end of the gradient.
                      // 0.3 as a boundary seems to work well.
+                     if (brush == sets.at(i)->labelBrush() || m_force) {
                      if (takeAtPos < 0.3)
                          sets.at(i)->setLabelBrush(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1));
                      else
                          sets.at(i)->setLabelBrush(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0));
+                     }
                      if (pen == sets.at(i)->pen() ||  m_force) {
                          QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages