HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1446:f8259d05b01f

fixed legend scrolling in detached mode. updated example

sauimone -

r1446:f8259d05b01f

parent child

Context file:

r1446:f8259d05b01f

Collapse all files

examples/legend/mainwidget.cpp +1 -1

                 m_legendHeight->setMinimum(0);
                 m_legendHeight->setMaximum(chartViewRect.height());
-                m_legendHeight->setValue(64);
+                m_legendHeight->setValue(75);
             }
             void MainWidget::hideLegendSpinbox()

src/legend/qlegend.cpp +36 -5

                     }
                 }
-                // If detached, the scrolling and layout logic is inverted.
+                // If detached, the scrolling direction is vertical instead of horizontal and vice versa.
                 if (!m_attachedToChart) {
                     scrollHorizontal = !scrollHorizontal;
                 }
+                // Limit offset between m_minOffset and m_maxOffset
                 if (scrollHorizontal) {
                     if(m_width<=m_rect.width()) return;
                     if (x != m_offsetX) {
-                        m_offsetX = qBound(qreal(0), x, m_width - m_rect.width());
+                        m_offsetX = qBound(m_minOffsetX, x, m_maxOffsetX);
                         m_markers->setPos(-m_offsetX,m_rect.top());
                     }
                 } else {
                     if(m_height<=m_rect.height()) return;
                     if (y != m_offsetY) {
-                        m_offsetY = qBound(qreal(0), y, m_height - m_rect.height());
+                        m_offsetY = qBound(m_minOffsetY, y, m_maxOffsetY);
                         m_markers->setPos(m_rect.left(),-m_offsetY);
                     }
                 }
                     break;
                 }
+                m_minOffsetX = 0;
+                m_minOffsetY = 0;
+                m_maxOffsetX = m_width - m_rect.width();
+                m_maxOffsetY = m_height - m_rect.height();
                 m_presenter->updateLayout();
             }
             void QLegendPrivate::updateDetachedLayout()
             {
+                // Detached layout is different.
+                // In detached mode legend may have multiple rows and columns, so layout calculations
+                // differ a log from attached mode.
+                // Also the scrolling logic is bit different.
                 m_offsetX=0;
+                m_offsetY=0;
                 QList<QGraphicsItem *> items = m_markers->childItems();
                 if(items.isEmpty()) return;
                         }
                         m_markers->setPos(m_rect.topLeft());
                         m_width = m_minWidth;
+                        m_minOffsetX = 0;
+                        m_minOffsetY = 0;
+                        m_maxOffsetX = m_width - m_rect.width();
+                        m_maxOffsetY = m_height - m_rect.height();
                     }
                     break;
                     case Qt::AlignBottom: {
                         }
                         m_markers->setPos(m_rect.topLeft());
                         m_width = m_minWidth;
+                        m_minOffsetX = 0;
+                        m_minOffsetY = qMin(m_rect.topLeft().y(), m_rect.topLeft().y() - m_height + m_rect.height());
+                        m_maxOffsetX = m_width - m_rect.width();
+                        m_maxOffsetY = 0;
                     }
                     break;
                     case Qt::AlignLeft: {
                             m_minWidth = qMax(m_minWidth,rect.width());
                             m_minHeight = qMax(m_minHeight,h);
                             maxWidth = qMax(maxWidth,w);
-                            m_width = qMax(m_width, maxWidth);
                             item->setPos(point.x(),point.y());
                             point.setY(point.y() + h);
                             if (point.y() + h > m_rect.topLeft().y() + m_rect.height()) {
                                 }
                             }
                         }
+                        m_width += maxWidth;
                         m_markers->setPos(m_rect.topLeft());
                         m_height = m_minHeight;
+                        m_minOffsetX = 0;
+                        m_minOffsetY = 0;
+                        m_maxOffsetX = m_width - m_rect.width();
+                        m_maxOffsetY = m_height - m_rect.height();
                     }
                     break;
                     case Qt::AlignRight: {
                             m_minWidth = qMax(m_minWidth,rect.width());
                             m_minHeight = qMax(m_minHeight,h);
                             maxWidth = qMax(maxWidth,w);
-                            m_width = qMax(m_width, maxWidth);
                             item->setPos(point.x() - w,point.y());
                             point.setY(point.y() + h);
                             if (point.y() + h > m_rect.topLeft().y() + m_rect.height()) {
                                 }
                             }
                         }
+                        m_width += maxWidth;
                         m_markers->setPos(m_rect.topLeft());
                         m_height = m_minHeight;
+                        m_minOffsetX = qMin(m_rect.topLeft().x(), m_rect.topLeft().x() - m_width + m_rect.width());
+                        m_minOffsetY = 0;
+                        m_maxOffsetX = 0;
+                        m_maxOffsetY = m_height - m_rect.height();
                     }
                     break;
                     default:

src/legend/qlegend_p.h +4 0

                 QRectF m_rect;
                 qreal m_offsetX;
                 qreal m_offsetY;
+                qreal m_minOffsetX;
+                qreal m_minOffsetY;
+                qreal m_maxOffsetX;
+                qreal m_maxOffsetY;
                 qreal m_minWidth;
                 qreal m_minHeight;
                 qreal m_width;

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