diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-01 03:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-01 03:00:09 +0200 |
| commit | db8faea3a21e5a878865e1556c00b93720ebf275 (patch) | |
| tree | e88079e652e81bb04aa8c83a7014b45230275de7 /src | |
| parent | 59ee4adfb0751f250c11301b2e0cef2de08cfa52 (diff) | |
| parent | 0279e65c25b22066d15752267a6b5d1ba660e7d9 (diff) | |
| download | qtsvg-db8faea3a21e5a878865e1556c00b93720ebf275.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0896068c2364ef73b2dc5656dd5291a5bd4fc48d
Diffstat (limited to 'src')
| -rw-r--r-- | src/svg/qsvgtinydocument_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h index c69c5de..aa51751 100644 --- a/src/svg/qsvgtinydocument_p.h +++ b/src/svg/qsvgtinydocument_p.h @@ -141,11 +141,14 @@ private: inline QSize QSvgTinyDocument::size() const { - if (m_size.isEmpty()) { + if (m_size.isEmpty()) return viewBox().size().toSize(); - } else { - return m_size; + if (m_widthPercent || m_heightPercent) { + const int width = m_widthPercent ? qRound(0.01 * m_size.width() * viewBox().size().width()) : m_size.width(); + const int height = m_heightPercent ? qRound(0.01 * m_size.height() * viewBox().size().height()) : m_size.height(); + return QSize(width, height); } + return m_size; } inline int QSvgTinyDocument::width() const |