From 82bf43b42362b7d5dfc80b9adbb77a89bce2644b Mon Sep 17 00:00:00 2001 From: Tero Ahola Date: Mon, 3 Sep 2012 10:56:22 +0300 Subject: Improved ChartView.minimuMargins implementation --- plugins/declarative/declarativechart.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'plugins/declarative/declarativechart.h') diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index 5733267b..2f03bbce 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -41,11 +41,11 @@ class DeclarativeChart : public QDeclarativeItem Q_PROPERTY(int count READ count) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged) Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged) - Q_PROPERTY(qreal topMargin READ topMargin NOTIFY topMarginChanged) - Q_PROPERTY(qreal bottomMargin READ bottomMargin NOTIFY bottomMarginChanged) - Q_PROPERTY(qreal leftMargin READ leftMargin NOTIFY leftMarginChanged) - Q_PROPERTY(qreal rightMargin READ rightMargin NOTIFY rightMarginChanged) - Q_PROPERTY(DeclarativeMargins *minimumMargins READ minimumMargins REVISION 1) + Q_PROPERTY(qreal topMargin READ topMargin) + Q_PROPERTY(qreal bottomMargin READ bottomMargin) + Q_PROPERTY(qreal leftMargin READ leftMargin) + Q_PROPERTY(qreal rightMargin READ rightMargin) + Q_PROPERTY(DeclarativeMargins *minimumMargins READ minimumMargins NOTIFY minimumMarginsChanged REVISION 1) Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1) Q_ENUMS(Animation) Q_ENUMS(Theme) @@ -139,14 +139,10 @@ Q_SIGNALS: void titleColorChanged(QColor color); void backgroundColorChanged(); void dropShadowEnabledChanged(bool enabled); - void topMarginChanged(qreal margin); - void bottomMarginChanged(qreal margin); - void leftMarginChanged(qreal margin); - void rightMarginChanged(qreal margin); + void minimumMarginsChanged(); void plotAreaChanged(QRectF plotArea); public Q_SLOTS: -// void handleMarginsChanged(QRectF newMargins); void changeMinimumMargins(int top, int bottom, int left, int right); void handleAxisXSet(QAbstractAxis *axis); void handleAxisYSet(QAbstractAxis *axis); -- cgit v1.2.3