HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2088:5149de44ec86

Fix title font resize does not invalidate layout

Michal Klocek -

r2088:5149de44ec86

parent child

Context file:

r2088:5149de44ec86

Collapse all files

src/chartlayout.cpp 0 -1

             #include "charttitle_p.h"
             #include "chartbackground_p.h"
             #include "legendmarker_p.h"
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/legend/legendlayout.cpp +8 0

                 return QPointF(m_offsetX,m_offsetY);
             }
+            void LegendLayout::invalidate()
+            {
+                QGraphicsLayout::invalidate();
+                if(m_legend->isAttachedToChart()){
+                    m_legend->d_ptr->m_presenter->layout()->invalidate();
+                }
+            }
             void LegendLayout::setGeometry(const QRectF& rect)
             {
                 m_legend->d_ptr->items()->setVisible(m_legend->isVisible());

src/legend/legendlayout_p.h +1 0

                 void setOffset(qreal x, qreal y);
                 QPointF offset() const;
+                void invalidate();
             protected:
                 QSizeF sizeHint ( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
                 int count() const { return 0; }

src/legend/legendmarker.cpp +1 -1

                 QFontMetrics fn(font);
                 m_markerRect = QRectF(0,0,fn.height()/2,fn.height()/2);
                 updateGeometry();
+                m_legend->layout()->invalidate();
             }
             QFont LegendMarker::font() const
                     default:
                       break;
                   }
                   return sh;
             }

src/legend/qlegend.cpp +5 -14

             {
                 if(d_ptr->m_alignment!=alignment) {
                     d_ptr->m_alignment = alignment;
-                    if(isAttachedToChart()){
-                        d_ptr->m_presenter->layout()->invalidate();
-                    }else{
                     layout()->invalidate();
                 }
             }
             Qt::Alignment QLegend::alignment() const
             {
             void QLegend::detachFromChart()
             {
                 d_ptr->m_attachedToChart = false;
-                d_ptr->m_layout->invalidate();
+                layout()->invalidate();
                 setParent(0);
             }
             void QLegend::attachToChart()
             {
                 d_ptr->m_attachedToChart = true;
-                d_ptr->m_presenter->layout()->invalidate();
+                layout()->invalidate();
                 setParent(d_ptr->m_chart);
             }
                if(isAttachedToChart()) d_ptr->m_presenter->layout()->invalidate();
                QGraphicsWidget::hideEvent(event);
             }
             /*!
              \internal \a event see QGraphicsWidget for details
              */
             void QLegend::showEvent(QShowEvent *event)
             {
                if(isAttachedToChart()) {
-                   d_ptr->m_presenter->layout()->invalidate();
                    d_ptr->items()->setVisible(false);
                    layout()->invalidate();
                }
                 QObject::connect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
                 m_items->setVisible(false);
-                q_ptr->layout()->invalidate();
+                m_layout->invalidate();
-                m_presenter->layout()->invalidate();
             }
             void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
                 QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
                 QObject::disconnect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
+                m_layout->invalidate();
-                q_ptr->layout()->invalidate();
             }
             void QLegendPrivate::handleSeriesVisibleChanged()
                         marker->setVisible(series->isVisible());
                     }
                 }
+                m_layout->invalidate();
-                q_ptr->layout()->invalidate();
             }
             void QLegendPrivate::handleCountChanged()

src/legend/qlegend_p.h +1 0

                 bool m_backgroundVisible;
             friend class QLegend;
+            friend class LegendLayout;
             };

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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