HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1538:8f0be28e5215

Fixes blinking and minimal false size for legend

Michal Klocek -

r1538:8f0be28e5215

parent child

Context file:

r1538:8f0be28e5215

src/chartlayout.cpp +2 0

             #include "chartlayout_p.h"
             #include "chartpresenter_p.h"
             #include "chartaxis_p.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             void ChartLayout::setGeometry(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 QGraphicsLayout::setGeometry(rect);

src/legend/legendlayout.cpp +9 -1

             #include "chartpresenter_p.h"
             #include "legendmarker_p.h"
             #include "qlegend_p.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             void LegendLayout::setGeometry(const QRectF& rect)
             {
-                if (!rect.isValid()) return;
                 QGraphicsLayout::setGeometry(rect);
             void LegendLayout::setAttachedGeometry(const QRectF& rect)
             {
+                if (!rect.isValid()) return;
                 m_offsetX=0;
                 m_offsetY=0;
             void LegendLayout::setDettachedGeometry(const QRectF& rect)
             {
+                if (!rect.isValid()) return;
                 // Detached layout is different.
                 // In detached mode legend may have multiple rows and columns, so layout calculations
                 // differ a log from attached mode.
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
+                if(which!=Qt::PreferredSize) return QSizeF(-1,-1);
                 if(constraint.isValid()) {
                     foreach(LegendMarker* marker, m_legend->d_ptr->markers()) {
                         size = size.expandedTo(marker->effectiveSizeHint(which));
                     }
                 }
                 size += QSize(left + right, top + bottom);
                 return size;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qlegend.cpp +1 0

                 }
                 q_ptr->layout()->invalidate();
+                q_ptr->layout()->activate();
             }
             void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)

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