From 8d7d66e44a18136d2d666bce03702543a0a8cf49 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 5 Sep 2012 10:42:37 +0300 Subject: Refactors layout * adds sizeHints to layout managers * adds sizeHiint to axes * adds "..." wraping to titles * adds title for axes * adds "..." wraping to legend markers * adds logic for layouting axes vs legend vs plotArea * renames minimumMargins to margin * marings size is always keept * legend takes contentMargins into consideration during layout * charts takes contentMargins into consideration during layout * adds "..." wraping to chartvaleaxisY * adds logic to resize plotArea during scale and scroll --- plugins/declarative/declarativechart.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/declarative/declarativechart.cpp') diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index 572befde..6ee43be3 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -245,7 +245,7 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent) void DeclarativeChart::changeMinimumMargins(int top, int bottom, int left, int right) { - m_chart->setMinimumMargins(QMargins(left, top, right, bottom)); + m_chart->setMargins(QMargins(left, top, right, bottom)); emit minimumMarginsChanged(); emit plotAreaChanged(m_chart->plotArea()); } @@ -501,6 +501,7 @@ qreal DeclarativeChart::topMargin() qreal DeclarativeChart::bottomMargin() { + qWarning() << "ChartView.bottomMargin is deprecated. Use minimumMargins and plotArea instead."; return m_chart->plotArea().bottom(); } -- cgit v1.2.3