HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2082:786b61dc6f56

fixes legend not vibile after showEvent

Michal Klocek -

r2082:786b61dc6f56

parent child

Context file:

r2082:786b61dc6f56

src/legend/legendlayout.cpp +3 -4

             {
                 m_legend->d_ptr->items()->setVisible(m_legend->isVisible());
-                if(m_legend->isAttachedToChart()) {
+                QGraphicsLayout::setGeometry(rect);
+                if(m_legend->isAttachedToChart()) {
                     setAttachedGeometry(rect);
+                } else {
-                else {
                     setDettachedGeometry(rect);
                 }
-                QGraphicsLayout::setGeometry(rect);
             }
             void LegendLayout::setAttachedGeometry(const QRectF& rect)

src/legend/qlegend.cpp +5 -3

             {
                 if(d_ptr->m_alignment!=alignment) {
                     d_ptr->m_alignment = alignment;
-                    updateGeometry();
                     if(isAttachedToChart()){
                         d_ptr->m_presenter->layout()->invalidate();
                     }else{
              */
             void QLegend::hideEvent(QHideEvent *event)
             {
-               d_ptr->m_presenter->layout()->invalidate();
+               if(isAttachedToChart()) d_ptr->m_presenter->layout()->invalidate();
                QGraphicsWidget::hideEvent(event);
             }
              */
             void QLegend::showEvent(QShowEvent *event)
             {
-               QGraphicsWidget::showEvent(event);
+               if(isAttachedToChart()) {
                    d_ptr->m_presenter->layout()->invalidate();
                    d_ptr->items()->setVisible(false);
+                   layout()->invalidate();
+               }
+               QGraphicsWidget::showEvent(event);
                //layout activation will show the items
             }

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