diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-02 07:39:51 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-02 08:21:43 +0300 |
| commit | 46245d05911d8b21781cb6dcd3296f16d8f548b4 (patch) | |
| tree | 5c9fa584670275eb99c85b06630347789164e5d1 /src/datavis3d | |
| parent | 984dc3069fc399178a234b3e740374f76af7ad04 (diff) | |
Font size adjustment bug fix
Change-Id: I80a0f20bb66e3d77f0ca4157743efaf6e02ead2f
Change-Id: I80a0f20bb66e3d77f0ca4157743efaf6e02ead2f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d')
| -rw-r--r-- | src/datavis3d/engine/q3dbars.cpp | 4 | ||||
| -rw-r--r-- | src/datavis3d/engine/q3dbars_p.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp index 0b6dc60c..85350521 100644 --- a/src/datavis3d/engine/q3dbars.cpp +++ b/src/datavis3d/engine/q3dbars.cpp @@ -1361,14 +1361,13 @@ void Q3DBars::setWindowTitle(const QString &title) void Q3DBars::setFontSize(float fontsize) { - d_ptr->m_fontSize = fontsize; + d_ptr->m_font.setPointSizeF(fontsize); d_ptr->m_drawer->setFont(d_ptr->m_font); } void Q3DBars::setFont(const QFont &font) { d_ptr->m_font = font; - d_ptr->m_fontSize = font.pointSizeF(); d_ptr->m_drawer->setFont(font); } @@ -1564,7 +1563,6 @@ Q3DBarsPrivate::Q3DBarsPrivate(Q3DBars *q) m_zoomActivated(false), m_textureHelper(new TextureHelper()), m_labelTransparency(TransparencyNone), - m_fontSize(10.0f), m_font(QFont(QStringLiteral("Arial"))), m_drawer(new Drawer(*m_theme, m_font, m_labelTransparency)), m_xFlipped(false), diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h index f7110566..472fe8d6 100644 --- a/src/datavis3d/engine/q3dbars_p.h +++ b/src/datavis3d/engine/q3dbars_p.h @@ -154,7 +154,6 @@ public: bool m_zoomActivated; TextureHelper *m_textureHelper; LabelTransparency m_labelTransparency; - GLfloat m_fontSize; QFont m_font; Drawer *m_drawer; bool m_xFlipped; |