diff --git a/src/legend/legendscroller_p.h b/src/legend/legendscroller_p.h index e006179..dd5fd2c 100644 --- a/src/legend/legendscroller_p.h +++ b/src/legend/legendscroller_p.h @@ -32,6 +32,7 @@ #define LEGENDSCROLLER_P_H #include "qlegend.h" +#include "qlegend_p.h" #include "scroller_p.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -46,24 +47,21 @@ public: void setOffset(const QPointF& point) { - QLegend::setOffset(point); + d_ptr->setOffset(point.x(), point.y()); } QPointF offset() const { - return QLegend::offset(); + return d_ptr->offset(); } void mousePressEvent(QGraphicsSceneMouseEvent* event){ Scroller::mousePressEvent(event); - //QLegend::mousePressEvent(event); } void mouseMoveEvent(QGraphicsSceneMouseEvent* event){ Scroller::mouseMoveEvent(event); - //QLegend::mouseMoveEvent(event); } void mouseReleaseEvent(QGraphicsSceneMouseEvent* event){ Scroller::mouseReleaseEvent(event); - //QLegend::mouseReleaseEvent(event); } }; diff --git a/src/legend/qlegend.cpp b/src/legend/qlegend.cpp index 547eca3..324e813 100644 --- a/src/legend/qlegend.cpp +++ b/src/legend/qlegend.cpp @@ -303,22 +303,6 @@ bool QLegend::isAttachedToChart() } /*! - Sets the legend's scrolling offset to value defined by \a point. -*/ -void QLegend::setOffset(const QPointF& point) -{ - d_ptr->setOffset(point.x(),point.y()); -} - -/*! - Returns the legend's scrolling offset. -*/ -QPointF QLegend::offset() const -{ - return QPointF(d_ptr->m_offsetX,d_ptr->m_offsetY); -} - -/*! Sets the visibility of legend background to \a visible */ void QLegend::setBackgroundVisible(bool visible) @@ -448,6 +432,10 @@ void QLegendPrivate::setOffset(qreal x, qreal y) } } +QPointF QLegendPrivate::offset() const +{ + return QPointF(m_offsetX,m_offsetY); +} void QLegendPrivate::updateLayout() { @@ -742,6 +730,7 @@ void QLegendPrivate::handleUpdatePieSeries() handleSeriesAdded(series, 0); } + #include "moc_qlegend.cpp" #include "moc_qlegend_p.cpp" diff --git a/src/legend/qlegend.h b/src/legend/qlegend.h index d62f925..22dcd92 100644 --- a/src/legend/qlegend.h +++ b/src/legend/qlegend.h @@ -80,9 +80,6 @@ public: void setBackgroundVisible(bool visible = true); bool isBackgroundVisible() const; - void setOffset(const QPointF& point); - QPointF offset() const; - protected: void resizeEvent(QGraphicsSceneResizeEvent *event); void hideEvent(QHideEvent *event); diff --git a/src/legend/qlegend_p.h b/src/legend/qlegend_p.h index f1af9d2..00b654a 100644 --- a/src/legend/qlegend_p.h +++ b/src/legend/qlegend_p.h @@ -46,6 +46,7 @@ public: ~QLegendPrivate(); void setOffset(qreal x, qreal y); + QPointF offset() const; void updateLayout(); void updateDetachedLayout(); void attachToChart();