Implements minimumMargins

 * adds mising margin implementation
 * setter and getter for minimumMargins
 * changes return values QMargins instead of QRectF
 * updates unit tests
 * QML TODO: not clear what should be handled there margins or plotArea
 * fixes chartlayout - minimum width of Axis is calculated

1 files changed, 12 insertions, 10 deletions

diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp
index 351be3f0..e358243f 100644
--- a/plugins/declarative/declarativechart.cpp
+++ b/plugins/declarative/declarativechart.cpp
@@ -224,22 +224,24 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
 //    m_chart->axisX()->setNiceNumbersEnabled(false);
-    m_chartMargins = m_chart->margins();
+    //TODO: check what should be really here margins or platArea ?!
+    m_chartMargins = m_chart->minimumMargins();
     connect(m_chart, SIGNAL(marginsChanged(QRectF)), this, SLOT(handleMarginsChanged(QRectF)));
 }
 
 void DeclarativeChart::handleMarginsChanged(QRectF newMargins)
 {
+    //TODO: check what should be really here margins or platArea ?!
     if (m_chartMargins.top() != newMargins.top())
-        topMarginChanged(m_chart->margins().top());
+        topMarginChanged(m_chart->minimumMargins().top());
     if (m_chartMargins.bottom() != newMargins.bottom())
-        bottomMarginChanged(m_chart->margins().bottom());
+        bottomMarginChanged(m_chart->minimumMargins().bottom());
     if (m_chartMargins.left() != newMargins.left())
-        leftMarginChanged(m_chart->margins().left());
+        leftMarginChanged(m_chart->minimumMargins().left());
     if (m_chartMargins.right() != newMargins.right())
-        rightMarginChanged(m_chart->margins().right());
+        rightMarginChanged(m_chart->minimumMargins().right());
 
-    m_chartMargins = m_chart->margins();
+    m_chartMargins = m_chart->minimumMargins();
 }
 
 DeclarativeChart::~DeclarativeChart()
@@ -487,22 +489,22 @@ bool DeclarativeChart::dropShadowEnabled()
 
 qreal DeclarativeChart::topMargin()
 {
-    return m_chart->margins().top();
+    return m_chart->minimumMargins().top();
 }
 
 qreal DeclarativeChart::bottomMargin()
 {
-    return m_chart->margins().bottom();
+    return m_chart->minimumMargins().bottom();
 }
 
 qreal DeclarativeChart::leftMargin()
 {
-    return m_chart->margins().left();
+    return m_chart->minimumMargins().left();
 }
 
 qreal DeclarativeChart::rightMargin()
 {
-    return m_chart->margins().right();
+    return m_chart->minimumMargins().right();
 }
 
 void DeclarativeChart::zoom(qreal factor)