Changeset 68807 in vbox

Timestamp:

Sep 21, 2017 9:07:14 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixing flickering on resize in popup pane details widget

Location:

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

Files:

• UIPopupPane.cpp (modified) (2 diffs)
• UIPopupPaneDetails.cpp (modified) (6 diffs)
• UIPopupPaneDetails.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp

@@ -133 +133 @@
                              iTextPaneYOffset + iTextPaneHeight + m_iLayoutSpacing);
         m_pDetailsPane->resize(iTextPaneWidth + iButtonPaneMinimumWidth,
-                               m_pDetailsPane->minimumSizeHint().height() -  m_iLayoutMargin);
+                               m_pDetailsPane->minimumSizeHint().height());
         m_pDetailsPane->layoutContent();
     }
@@ -196 +196 @@
         /* Take into account layout: */
         iMinimumHeightHint += 2 * m_iLayoutMargin;
+        iMinimumHeightHint += m_iLayoutSpacing;
         {
             /* Take into account widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp

@@ -33 +33 @@
 UIPopupPaneDetails::UIPopupPaneDetails(QWidget *pParent, const QString &strText, bool fFocused)
     : QWidget(pParent)
-    , m_iLayoutMargin(0)
+    , m_iLayoutMargin(5)
     , m_iLayoutSpacing(10)
     , m_strText(strText)
     , m_pTextEdit(0)
     , m_iDesiredTextEditWidth(-1)
-    , m_iDesiredTextEditHeight(-1)
+    , m_iMaximumPaneHeight(-1)
+    , m_iMaximumTextEditHeight(0)
+    , m_iTextContentMargin(5)
     , m_fFocused(fFocused)
     , m_pAnimation(0)
@@ -95 +97 @@
     m_pTextEdit->move(m_iLayoutMargin, m_iLayoutMargin);
     m_pTextEdit->resize(qMin(iWidth, iTextEditWidth), qMin(iHeight, iTextEditHeight));
+    /* Text-document: */
+    QTextDocument *pTextDocument = m_pTextEdit->document();
+    if (pTextDocument)
+    {
+        pTextDocument->adjustSize();
+        pTextDocument->setTextWidth(m_pTextEdit->width() - m_iTextContentMargin);
+    }
 }
 
@@ -121 +130 @@
 {
     /* Make sure the desired-height has changed: */
-    if (m_iDesiredTextEditHeight == iHeight)
+    if (m_iMaximumPaneHeight == iHeight)
         return;
 
     /* Fetch new desired-height: */
-    m_iDesiredTextEditHeight = iHeight;
+    m_iMaximumPaneHeight = iHeight;
+    m_iMaximumTextEditHeight = m_iMaximumPaneHeight - 2 * m_iLayoutMargin;
 
     /* Update size-hint: */
@@ -184 +194 @@
         m_pTextEdit->setText(m_strText);
         m_pTextEdit->setFocusProxy(this);
-        m_pTextEdit->setLineWrapMode(QTextEdit::NoWrap);
     }
 }
@@ -208 +217 @@
     /* Recalculate expanded size-hint: */
     {
-        int iNewHeight = m_iDesiredTextEditHeight;
+        int iNewHeight = m_iMaximumPaneHeight;
         QTextDocument *pTextDocument = m_pTextEdit->document();
         if(pTextDocument)
@@ -217 +226 @@
             QSize textSize = pTextDocument->size().toSize();
             /* Make sure the text edits height is no larger than that of container widget: */
-            iNewHeight = qMin(iNewHeight, textSize.height());
+            iNewHeight = qMin(m_iMaximumTextEditHeight, textSize.height() + 2 * m_iLayoutMargin);
         }
         /* Recalculate label size-hint: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.h

@@ -96 +96 @@
     QTextEdit *m_pTextEdit;
     int m_iDesiredTextEditWidth;
-    int m_iDesiredTextEditHeight;
+    int m_iMaximumPaneHeight;
+    int m_iMaximumTextEditHeight;
+    int m_iTextContentMargin;
 
     /* Variables: Focus stuff: */