Changeset 50846 in vbox

Timestamp:

Mar 21, 2014 4:08:02 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: UIGraphicsTextPane: Minimum size-hint caching optimization.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics

Files:

• UIGraphicsTextPane.cpp (modified) (4 diffs)
• UIGraphicsTextPane.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp

@@ -30 +30 @@
     , m_iSpacing(10)
     , m_iMinimumTextColumnWidth(100)
+    , m_fMinimumSizeHintInvalidated(true)
     , m_iMinimumTextWidth(0)
     , m_iMinimumTextHeight(0)
@@ -63 +64 @@
     }
 
-    /* Update minimum text size-hint: */
+    /* Update minimum size-hint: */
     updateMinimumTextWidthHint();
     updateMinimumTextHeightHint();
+    updateGeometry();
 }
 
 void UIGraphicsTextPane::updateGeometry()
 {
+    /* Discard cached minimum size-hint: */
+    m_fMinimumSizeHintInvalidated = true;
+
     /* Call to base-class to notify layout if any: */
     QIGraphicsWidget::updateGeometry();
@@ -121 +126 @@
     /* Remember new value: */
     m_iMinimumTextWidth = iMinimumTextWidth;
-
-    /* Notify listeners: */
-    updateGeometry();
 }
 
@@ -198 +200 @@
     /* Remember new value: */
     m_iMinimumTextHeight = iMinimumTextHeight;
-
-    /* Notify listeners: */
+}
+
+QSizeF UIGraphicsTextPane::sizeHint(Qt::SizeHint which, const QSizeF &constraint /* = QSizeF() */) const
+{
+    /* For minimum size-hint: */
+    if (which == Qt::MinimumSize)
+    {
+        /* If minimum size-hint invalidated: */
+        if (m_fMinimumSizeHintInvalidated)
+        {
+            /* Recache minimum size-hint: */
+            m_minimumSizeHint = QSizeF(2 * m_iMargin + m_iMinimumTextWidth,
+                                       2 * m_iMargin + m_iMinimumTextHeight);
+            m_fMinimumSizeHintInvalidated = false;
+        }
+        /* Return cached minimum size-hint: */
+        return m_minimumSizeHint;
+    }
+    /* Call to base-class for other size-hints: */
+    return QIGraphicsWidget::sizeHint(which, constraint);
+}
+
+void UIGraphicsTextPane::resizeEvent(QGraphicsSceneResizeEvent*)
+{
+    /* Update minimum height-hint: */
+    updateMinimumTextHeightHint();
     updateGeometry();
-}
-
-QSizeF UIGraphicsTextPane::sizeHint(Qt::SizeHint which, const QSizeF &constraint /* = QSizeF() */) const
-{
-    /* Calculate minimum size-hint: */
-    if (which == Qt::MinimumSize)
-    {
-        int iWidth = 2 * m_iMargin + m_iMinimumTextWidth;
-        int iHeight = 2 * m_iMargin + m_iMinimumTextHeight;
-        return QSize(iWidth, iHeight);
-    }
-    /* Call to base-class: */
-    return QIGraphicsWidget::sizeHint(which, constraint);
-}
-
-void UIGraphicsTextPane::resizeEvent(QGraphicsSceneResizeEvent*)
-{
-    /* Update minimum text height-hint: */
-    updateMinimumTextHeightHint();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.h

@@ -82 +82 @@
     const int m_iMinimumTextColumnWidth;
 
+    /** Minimum size-hint invalidation flag. */
+    mutable bool m_fMinimumSizeHintInvalidated;
+    /** Minimum size-hint cache. */
+    mutable QSizeF m_minimumSizeHint;
     /** Minimum text-width. */
     int m_iMinimumTextWidth;