Changeset 41175 in vbox for trunk/src

Timestamp:

May 5, 2012 2:29:39 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6141: Fixing another crash (in QIMessageBox and QIArrowSplitter) which were happening if settings-dialog was opened during VM poweroff/shutdown.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIArrowSplitter.cpp (modified) (3 diffs)
• QIArrowSplitter.h (modified) (1 diff)
• QIDialog.cpp (modified) (3 diffs)
• QIDialog.h (modified) (2 diffs)
• QIMessageBox.cpp (modified) (3 diffs)
• QIMessageBox.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

@@ -78 +78 @@
 {
     mSwitchButton->setText (aName);
-    relayout();
+    emit sigSizeChanged();
 }
 
@@ -84 +84 @@
 {
     mChild->setVisible (mSwitchButton->isExpanded());
-    relayout();
+    emit sigSizeChanged();
 }
 
@@ -139 +139 @@
 }
 
-void QIArrowSplitter::relayout()
-{
-    /* Update full layout system of message window */
-    QList <QLayout*> layouts = findChildren <QLayout*> ();
-    foreach (QLayout *item, layouts)
-    {
-        item->update();
-        item->activate();
-    }
-
-    /* Update main layout of message window at last */
-    window()->layout()->update();
-    window()->layout()->activate();
-    qApp->processEvents();
-
-    /* Now resize window to minimum possible size */
-    window()->resize (window()->minimumSizeHint());
-    qApp->processEvents();
-
-    /* Check if we have to make dialog fixed in height */
-    if (mSwitchButton->isExpanded())
-        window()->setMaximumHeight (QWIDGETSIZE_MAX);
-    else
-        window()->setFixedHeight (window()->minimumSizeHint().height());
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h

@@ -62 +62 @@
     void showBackDetails();
     void showNextDetails();
+    void sigSizeChanged();
 
 private:
 
     bool eventFilter (QObject *aObject, QEvent *aEvent);
-
-    void relayout();
 
     QVBoxLayout *mMainLayout;

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp

@@ -25 +25 @@
 #endif /* Q_WS_MAC */
 
-/* Qt includes */
-#include <QPointer>
-
 QIDialog::QIDialog (QWidget *aParent /* = 0 */, Qt::WindowFlags aFlags /* = 0 */)
     : QDialog (aParent, aFlags)
     , mPolished (false)
-    , mEventLoop (0)
 {
 }
@@ -89 +85 @@
 
     /* Create a local event loop */
-    mEventLoop = new QEventLoop();
+    QEventLoop eventLoop;
+    mEventLoop = &eventLoop;
     /* Show the window if requested */
     if (aShow)
@@ -96 +93 @@
     QPointer<QIDialog> guard = this;
     /* Start the event loop. This blocks. */
-    mEventLoop->exec();
-    /* Delete the event loop */
-    delete mEventLoop;
-    mEventLoop = 0;
+    eventLoop.exec();
     /* Are we valid anymore? */
     if (guard.isNull())
         return QDialog::Rejected;
+    mEventLoop = 0;
     /* Save the result code in case we delete ourself */
     QDialog::DialogCode res = (QDialog::DialogCode)result();

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.h

@@ -22 +22 @@
 /* Qt includes */
 #include <QDialog>
+#include <QPointer>
 
 /* Qt forwards declarations */
@@ -43 +44 @@
     /* Private member vars */
     bool mPolished;
-    QEventLoop *mEventLoop;
+    QPointer<QEventLoop> mEventLoop;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

@@ -137 +137 @@
     connect (mDetailsSplitter, SIGNAL (showBackDetails()), this, SLOT (detailsBack()));
     connect (mDetailsSplitter, SIGNAL (showNextDetails()), this, SLOT (detailsNext()));
+    connect (mDetailsSplitter, SIGNAL (sigSizeChanged()), this, SLOT (sltUpdateSize()));
     detailsVBoxLayout->addWidget (mDetailsSplitter);
 
@@ -369 +370 @@
         /* Polishing sub-widgets */
         resize (minimumSizeHint());
-        qApp->processEvents();
         mTextLabel->useSizeHintForWidth (mTextLabel->width());
         mTextLabel->updateGeometry();
-        qApp->processEvents();
         setFixedWidth (width());
         mDetailsSplitter->toggleWidget();
@@ -434 +433 @@
         mSpacer->changeSize (0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
     }
+}
+
+void QIMessageBox::sltUpdateSize()
+{
+    /* Update/activate all the layouts of the message-box: */
+    QList<QLayout*> layouts = findChildren<QLayout*>();
+    for (int i = 0; i < layouts.size(); ++i)
+    {
+        QLayout *pItem = layouts.at(i);
+        pItem->update();
+        pItem->activate();
+    }
+    QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+
+    /* Now resize message-box to the minimum possible size: */
+    resize(minimumSizeHint());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h

@@ -22 +22 @@
 /* VBox includes */
 #include "QIDialog.h"
-#include "QIArrowSplitter.h"
 
 /* Qt includes */
@@ -105 +104 @@
 private slots:
 
+    void sltUpdateSize();
+
     void detailsBack();
     void detailsNext();