HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1458:1e5e1b9c40c3

moved legend offset to private side

sauimone -

r1458:1e5e1b9c40c3

parent child

Context file:

r1458:1e5e1b9c40c3

src/legend/legendscroller_p.h +3 -5

             #define LEGENDSCROLLER_P_H
             #include "qlegend.h"
+            #include "qlegend_p.h"
             #include "scroller_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 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);
                 }
             };

src/legend/qlegend.cpp +5 -16

             }
             /*!
-                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)
                 }
             }
+            QPointF QLegendPrivate::offset() const
+            {
+                return QPointF(m_offsetX,m_offsetY);
+            }
             void QLegendPrivate::updateLayout()
             {
                 handleSeriesAdded(series, 0);
             }
             #include "moc_qlegend.cpp"
             #include "moc_qlegend_p.cpp"

src/legend/qlegend.h 0 -3

                 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);

src/legend/qlegend_p.h +1 0

                 ~QLegendPrivate();
                 void setOffset(qreal x, qreal y);
+                QPointF offset() const;
                 void updateLayout();
                 void updateDetachedLayout();
                 void attachToChart();

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages