Changeset 78026 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 5, 2019 11:21:07 AM (6 years ago)

Author:

vboxsync

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

129803

Message:

FE/Qt: bugref:6699. Truncate the text of the bread crumbs widget correctly during resize.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -84 +84 @@
     UIFileManagerBreadCrumbs(QWidget *pParent = 0);
     void setPath(const QString &strPath);
+
+protected:
+
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
+
+private:
+
+    QString m_strPath;
 };
 
@@ -106 +114 @@
     void reset();
 
-protected:
-
-    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
-
 private slots:
 
@@ -124 +128 @@
     UIFileManagerHistoryComboBox *m_pHistoryComboBox;
     QToolButton                  *m_pSwitchButton;
-    QString                       m_strPath;
 };
 
@@ -253 +256 @@
 void UIFileManagerNavigationWidget::setPath(const QString &strLocation)
 {
-    m_strPath = strLocation;
-
     if (m_pBreadCrumbs)
         m_pBreadCrumbs->setPath(strLocation);
@@ -286 +287 @@
 }
 
-void UIFileManagerNavigationWidget::resizeEvent(QResizeEvent *pEvent)
-{
-    if (m_pBreadCrumbs)
-        m_pBreadCrumbs->setPath(m_strPath);
-
-    QWidget::resizeEvent(pEvent);
-}
-
 void UIFileManagerNavigationWidget::prepare()
 {
@@ -388 +381 @@
 
     setPalette(newPalette);
+    /* Allow the labe become smaller than the current text. calling setpath in resizeEvent truncated the text anyway: */
+    setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
 }
 
 void UIFileManagerBreadCrumbs::setPath(const QString &strPath)
 {
+    m_strPath = strPath;
+
     const QChar separator('/');
     clear();
@@ -430 +427 @@
     }
     setText(strLabelText);
+}
+
+void UIFileManagerBreadCrumbs::resizeEvent(QResizeEvent *pEvent)
+{
+    /* Truncate the text the way we want: */
+    setPath(m_strPath);
+    QLabel::resizeEvent(pEvent);
 }