Changeset 2170 in vbox for trunk

Timestamp:

Apr 18, 2007 1:09:20 PM (18 years ago)

Author:

vboxsync

Message:

1934: Never decrease size in the layout:

1. Created the proposed QIConstrainKeeper for using it for individual child widgets with dynamic contents.
2. QIConstrainKeeper used for the horizontal size of the Start/Show button, to have it's minimum size fixed at it's maximum value.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -134 +134 @@
 };
 
+class QIConstrainKeeper : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    QIConstrainKeeper (QWidget*);
+
+private:
+
+    bool eventFilter (QObject*, QEvent*);
+};
+
 // VBoxGlobal
 ////////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -470 +470 @@
 
 #endif /* Q_WS_WIN */
+
+// QIConstrainKeeper
+////////////////////////////////////////////////////////////////////////////////
+
+QIConstrainKeeper::QIConstrainKeeper (QWidget *aParent) : QObject (aParent)
+{
+    aParent->setMinimumSize (aParent->size());
+    aParent->installEventFilter (this);
+}
+
+bool QIConstrainKeeper::eventFilter (QObject *aObject, QEvent *aEvent)
+{
+    if (aObject == parent() && aEvent->type() == QEvent::Resize)
+    {
+        QResizeEvent *ev = static_cast<QResizeEvent*> (aEvent);
+        QSize oldSize = ev->oldSize();
+        QSize newSize = ev->size();
+        int maxWidth = newSize.width() > oldSize.width() ?
+            newSize.width() : oldSize.width();
+        int maxHeight = newSize.height() > oldSize.height() ?
+            newSize.height() : oldSize.height();
+        if (maxWidth > oldSize.width() || maxHeight > oldSize.height())
+            ((QWidget*)parent())->setMinimumSize (maxWidth, maxHeight);
+    }
+    return QObject::eventFilter (aObject, aEvent);
+}
 
 // VBoxGlobal
@@ -1945 +1971 @@
     else
         loadOk = false;
-    
+
     if (loadOk)
         sLoadedLangId = selectedLangId;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -980 +980 @@
             break;
         }
+        case QEvent::Show:
+        {
+            /* Constrain StartVM button size */
+            QObjectList *list = queryList ("QToolButton",
+                QString (vmStartAction->name()) + "_action_button");
+            QToolButton *actionButton = list->first() ?
+                static_cast<QToolButton*> (list->first()) : 0;
+            if (actionButton)
+                new QIConstrainKeeper (actionButton);
+            break;
+        }
 
         default:

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui

@@ -2841 +2841 @@
     <slot>cdMediaChanged()</slot>
     <slot>fdMediaChanged()</slot>
-    <slot>processAdjustSize()</slot>
     <slot>updateInterfaces( QWidget* )</slot>
     <slot>networkPageUpdate( QWidget* )</slot>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -424 +424 @@
                                      6 /* seems that RichText adds some margin */ +
                                      whatsThisLabel->fontMetrics().width ('m') * 40);
-    connect (whatsThisLabel, SIGNAL (textChanged()), this, SLOT (processAdjustSize()));
 
     /*
@@ -799 +798 @@
     VBoxGlobal::centerWidget (this, parentWidget());
 }
-
-void VBoxVMSettingsDlg::processAdjustSize()
-{
-    int newHeight = minimumSize().height();
-    int oldHeight = height();
-    if (newHeight > oldHeight)
-        resize (minimumSize());
-}
-
 
 void VBoxVMSettingsDlg::updateShortcuts()