Changeset 107981 in vbox for trunk

Timestamp:

Jan 29, 2025 12:29:24 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167244

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Get rid of stuff related to tool item name compression; It was blindly copy-pasted years ago from chooser item prototype.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsItem.cpp (modified) (10 diffs)
• UIToolsItem.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -207 +207 @@
     , m_iPreviousMinimumWidthHint(0)
     , m_iPreviousMinimumHeightHint(0)
-    , m_iMaximumNameWidth(0)
 {
     prepare();
@@ -231 +230 @@
         /* Update linked values: */
         m_strName = strName;
-        updateMinimumNameSize();
-        updateVisibleName();
+        updateNameSize();
     }
 }
@@ -293 +291 @@
     int iToolsItemWidth = m_pixmapSize.width();
     if (model()->tools()->isPopup())
-        iToolsItemWidth += iSpacing + m_minimumNameSize.width();
+        iToolsItemWidth += iSpacing + m_nameSize.width();
     iProposedWidth += iToolsItemWidth;
 
@@ -312 +310 @@
     /* And Tools-item content to take into account: */
     int iToolsItemHeight = qMax(m_pixmapSize.height(),
-                                m_minimumNameSize.height());
+                                m_nameSize.height());
     iProposedHeight += iToolsItemHeight;
 
@@ -335 +333 @@
     /* Update pixmap: */
     updatePixmap();
-}
-
-void UIToolsItem::resizeEvent(QGraphicsSceneResizeEvent *pEvent)
-{
-    /* Call to base-class: */
-    QIGraphicsWidget::resizeEvent(pEvent);
-
-    /* What is the new geometry? */
-    const QRectF newGeometry = geometry();
-
-    /* Should we update visible name? */
-    if (previousGeometry().width() != newGeometry.width())
-        updateMaximumNameWidth();
-
-    /* Remember the new geometry: */
-    setPreviousGeometry(newGeometry);
 }
 
@@ -455 +437 @@
     /* Init: */
     updatePixmap();
-    updateMinimumNameSize();
-    updateVisibleName();
+    updateNameSize();
 }
 
@@ -588 +569 @@
     {
         m_pixmapSize = pixmapSize;
-        updateMaximumNameWidth();
         updateGeometry();
     }
@@ -598 +578 @@
 }
 
-void UIToolsItem::updateMinimumNameSize()
+void UIToolsItem::updateNameSize()
 {
     /* Prepare variables: */
     QPaintDevice *pPaintDevice = model()->paintDevice();
 
-    /* Calculate new minimum name size: */
+    /* Calculate new name size: */
     const QFontMetrics fm(m_nameFont, pPaintDevice);
-    const int iWidthOf15Letters = textWidthMonospace(m_nameFont, pPaintDevice, 15);
-    const QString strNameCompressedTo15Letters = compressText(m_nameFont, pPaintDevice, m_strName, iWidthOf15Letters);
-    const QSize minimumNameSize = QSize(fm.horizontalAdvance(strNameCompressedTo15Letters), fm.height());
+    const QSize nameSize = QSize(fm.horizontalAdvance(m_strName), fm.height());
 
     /* Update linked values: */
-    if (m_minimumNameSize != minimumNameSize)
-    {
-        m_minimumNameSize = minimumNameSize;
+    if (m_nameSize != nameSize)
+    {
+        m_nameSize = nameSize;
         updateGeometry();
     }
-}
-
-void UIToolsItem::updateMaximumNameWidth()
-{
-    /* Prepare variables: */
-    const int iMargin = data(ToolsItemData_Margin).toInt();
-    const int iSpacing = data(ToolsItemData_Spacing).toInt();
-
-    /* Calculate new maximum name width: */
-    int iMaximumNameWidth = (int)geometry().width();
-    iMaximumNameWidth -= iMargin; /* left margin */
-    iMaximumNameWidth -= m_pixmapSize.width(); /* pixmap width */
-    iMaximumNameWidth -= iSpacing; /* spacing between pixmap and name(s) */
-    iMaximumNameWidth -= iMargin; /* right margin */
-
-    /* Update linked values: */
-    if (m_iMaximumNameWidth != iMaximumNameWidth)
-    {
-        m_iMaximumNameWidth = iMaximumNameWidth;
-        updateVisibleName();
-    }
-}
-
-void UIToolsItem::updateVisibleName()
-{
-    /* Prepare variables: */
-    QPaintDevice *pPaintDevice = model()->paintDevice();
-
-    /* Calculate new visible name: */
-    const QString strVisibleName = compressText(m_nameFont, pPaintDevice, m_strName, m_iMaximumNameWidth);
-
-    /* Update linked values: */
-    if (m_strVisibleName != strVisibleName)
-    {
-        m_strVisibleName = strVisibleName;
-        update();
-    }
-}
-
-/* static */
-int UIToolsItem::textWidthMonospace(const QFont &font, QPaintDevice *pPaintDevice, int iCount)
-{
-    /* Return text width, based on font-metrics: */
-    const QFontMetrics fm(font, pPaintDevice);
-    QString strString;
-    strString.fill('_', iCount);
-    return fm.horizontalAdvance(strString);
-}
-
-/* static */
-QString UIToolsItem::compressText(const QFont &font, QPaintDevice *pPaintDevice, QString strText, int iWidth)
-{
-    /* Check if passed text is empty: */
-    if (strText.isEmpty())
-        return strText;
-
-    /* Check if passed text already fits maximum width: */
-    const QFontMetrics fm(font, pPaintDevice);
-    if (fm.horizontalAdvance(strText) <= iWidth)
-        return strText;
-
-    /* Truncate otherwise: */
-    const QString strEllipsis = QString("...");
-    const int iEllipsisWidth = fm.horizontalAdvance(strEllipsis + " ");
-    while (!strText.isEmpty() && fm.horizontalAdvance(strText) + iEllipsisWidth > iWidth)
-        strText.truncate(strText.size() - 1);
-    return strText + strEllipsis;
 }
 
@@ -895 +806 @@
         /* Prepare variables: */
         int iNameX = iMargin + m_pixmapSize.width() + iSpacing;
-        int iNameY = (iFullHeight - m_minimumNameSize.height()) / 2;
+        int iNameY = (iFullHeight - m_nameSize.height()) / 2;
         /* Paint name: */
         if (model()->tools()->isPopup())
@@ -907 +818 @@
                       model()->paintDevice(),
                       /* Text to paint: */
-                      m_strVisibleName);
+                      m_strName);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.h

@@ -143 +143 @@
         virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
 
-        /** Handles resize @a pEvent. */
-        virtual void resizeEvent(QGraphicsSceneResizeEvent *pEvent) RT_OVERRIDE;
-
         /** Handles hover enter @a event. */
         virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *pEvent) RT_OVERRIDE;
@@ -209 +206 @@
     /** @name Layout stuff.
       * @{ */
-        /** Defines previous @a geometry. */
-        void setPreviousGeometry(const QRectF &geometry) { m_previousGeometry = geometry; }
-        /** Returns previous geometry. */
-        const QRectF &previousGeometry() const { return m_previousGeometry; }
-
         /** Updates pixmap. */
         void updatePixmap();
-        /** Updates minimum name size. */
-        void updateMinimumNameSize();
-        /** Updates maximum name width. */
-        void updateMaximumNameWidth();
-        /** Updates visible name. */
-        void updateVisibleName();
-
-        /** Returns monospace text width of line containing @a iCount of chars calculated on the basis of certain @a font and @a pPaintDevice. */
-        static int textWidthMonospace(const QFont &font, QPaintDevice *pPaintDevice, int iCount);
-        /** Compresses @a strText to @a iWidth on the basis of certain @a font and @a pPaintDevice. */
-        static QString compressText(const QFont &font, QPaintDevice *pPaintDevice, QString strText, int iWidth);
+        /** Updates name size. */
+        void updateNameSize();
     /** @} */
 
@@ -271 +254 @@
         /** Holds the item name font. */
         QFont    m_nameFont;
-        /** Holds the item visible name. */
-        QString  m_strVisibleName;
 
         /** Holds whether item is hovered. */
@@ -307 +288 @@
     /** @name Layout stuff.
       * @{ */
-        /** Holds previous geometry. */
-        QRectF  m_previousGeometry;
-
         /** Holds previous minimum width hint. */
         int  m_iPreviousMinimumWidthHint;
@@ -317 +295 @@
         /** Holds the pixmap size. */
         QSize  m_pixmapSize;
-        /** Holds minimum name size. */
-        QSize  m_minimumNameSize;
-
-        /** Holds maximum name width. */
-        int  m_iMaximumNameWidth;
+        /** Holds the name size. */
+        QSize  m_nameSize;
     /** @} */
 };