diff --git a/src/charttheme.cpp b/src/charttheme.cpp index 98761c2..28f6f45 100644 --- a/src/charttheme.cpp +++ b/src/charttheme.cpp @@ -41,7 +41,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE ChartTheme::ChartTheme(QChart::ChartTheme id) : - m_masterFont(QFont()), + m_masterFont(QFont("arial", 12)), + m_labelFont(QFont("arial", 10)), m_titleBrush(QColor(QRgb(0x000000))), m_axisLinePen(QPen(QRgb(0x000000))), m_axisLabelBrush(QColor(QRgb(0x000000))), @@ -227,7 +228,7 @@ void ChartTheme::decorate(QPieSeries* series, int index, bool force) } if (data.m_labelFont.isThemed() || force) { - data.m_labelFont = m_masterFont; + data.m_labelFont = m_labelFont; data.m_labelFont.setThemed(true); } @@ -291,7 +292,7 @@ void ChartTheme::decorate(QChartAxis* axis,bool axisX, bool force) } if(font == axis->labelsFont() || force){ - axis->setLabelsFont(m_masterFont); + axis->setLabelsFont(m_labelFont); } } } diff --git a/src/charttheme_p.h b/src/charttheme_p.h index 4b295ea..682c783 100644 --- a/src/charttheme_p.h +++ b/src/charttheme_p.h @@ -64,6 +64,7 @@ protected: QLinearGradient m_chartBackgroundGradient; QFont m_masterFont; + QFont m_labelFont; QBrush m_titleBrush; QPen m_axisLinePen; QBrush m_axisLabelBrush; diff --git a/src/themes/chartthemebluecerulean_p.h b/src/themes/chartthemebluecerulean_p.h index 926404f..4c98907 100644 --- a/src/themes/chartthemebluecerulean_p.h +++ b/src/themes/chartthemebluecerulean_p.h @@ -23,7 +23,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_titleBrush = QBrush(QRgb(0xffffff)); m_axisLinePen = QPen(QRgb(0xd6d6d6)); m_axisLinePen.setWidth(2); diff --git a/src/themes/chartthemebluencs_p.h b/src/themes/chartthemebluencs_p.h index d3a386e..0e47e40 100644 --- a/src/themes/chartthemebluencs_p.h +++ b/src/themes/chartthemebluencs_p.h @@ -23,7 +23,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_titleBrush = QBrush(QRgb(0x404044)); m_axisLinePen = QPen(QRgb(0xd6d6d6)); m_axisLinePen.setWidth(2); diff --git a/src/themes/chartthemebrownsand_p.h b/src/themes/chartthemebrownsand_p.h index 806c296..8accd9b 100644 --- a/src/themes/chartthemebrownsand_p.h +++ b/src/themes/chartthemebrownsand_p.h @@ -23,7 +23,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_titleBrush = QBrush(QRgb(0x404044)); m_axisLinePen = QPen(QRgb(0xb5b0a7)); m_axisLinePen.setWidth(2); diff --git a/src/themes/chartthemedark_p.h b/src/themes/chartthemedark_p.h index b62d5ac..f6a493d 100644 --- a/src/themes/chartthemedark_p.h +++ b/src/themes/chartthemedark_p.h @@ -23,7 +23,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_titleBrush = QBrush(QRgb(0xffffff)); m_axisLinePen = QPen(QRgb(0x86878c)); m_axisLinePen.setWidth(2); diff --git a/src/themes/chartthemedefault_p.h b/src/themes/chartthemedefault_p.h index b7bbbe4..27cf134 100644 --- a/src/themes/chartthemedefault_p.h +++ b/src/themes/chartthemedefault_p.h @@ -63,7 +63,6 @@ public: GetGValue(colorWindow), GetBValue(colorWindow))); // Axes and other - m_masterFont = QFont("arial"); m_axisLinePen = QPen(0xd6d6d6); m_axisLinePen.setWidth(1); m_axisLabelBrush = QBrush(QRgb(0x404044)); @@ -87,7 +86,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_axisLinePen = QPen(0xd6d6d6); m_axisLinePen.setWidth(1); m_axisLabelBrush = QBrush(QRgb(0x404044)); @@ -111,7 +109,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_axisLinePen = QPen(0xd6d6d6); m_axisLinePen.setWidth(1); m_axisLabelBrush = QBrush(QRgb(0x404044)); @@ -135,7 +132,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_axisLinePen = QPen(0xd6d6d6); m_axisLinePen.setWidth(1); m_axisLabelBrush = QBrush(QRgb(0x404044)); diff --git a/src/themes/chartthemelight_p.h b/src/themes/chartthemelight_p.h index 7e600de..e544e5d 100644 --- a/src/themes/chartthemelight_p.h +++ b/src/themes/chartthemelight_p.h @@ -23,7 +23,6 @@ public: m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_masterFont = QFont("arial"); m_axisLinePen = QPen(0xd6d6d6); m_axisLinePen.setWidth(1); m_axisLabelBrush = QBrush(QRgb(0x404044));