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

Timestamp:

Nov 26, 2009 2:24:29 PM (15 years ago)

Author:

vboxsync

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

55309

Message:

FE/Qt4-OSX: Fix various focus & background color problems for some of the editor items in the appliance dialog on Cocoa.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxApplianceEditorWgt.h (modified) (1 diff)
• include/VBoxOSTypeSelectorButton.h (modified) (3 diffs)
• src/VBoxApplianceEditorWgt.cpp (modified) (2 diffs)
• src/VBoxOSTypeSelectorButton.cpp (modified) (2 diffs)

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

@@ -211 +211 @@
         return size;
     }
+
+protected:
+#ifdef QT_MAC_USE_COCOA
+    bool eventFilter (QObject *aObject, QEvent *aEvent);
+#endif /* QT_MAC_USE_COCOA */
+
 private:
     /* Private member vars */

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

@@ -24 +24 @@
 #define __VBoxOSTypeSelectorButton_h__
 
+/* VBox includes */
 #include "QIWithRetranslateUI.h"
 
+/* Qt includes */
 #include <QPushButton>
 
@@ -38 +40 @@
     QString osTypeId() const { return mOSTypeId; }
 
+    bool isMenuShown() const;
+
     void retranslateUi();
 
@@ -46 +50 @@
     void populateMenu();
 
+    /* Private member vars */
     QString mOSTypeId;
     QMenu *mMainMenu;

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

@@ -357 +357 @@
                      * the button hasn't a rectangle shape. This prevents the
                      * display of parts from the current text on the Mac. */
+#ifdef QT_MAC_USE_COCOA
+                    /* Use the palette from the tree view, not the one from the
+                     * editor. */
+                    QPalette p = e->palette();
+                    p.setBrush (QPalette::Highlight, aParent->palette().brush (QPalette::Highlight));
+                    e->setPalette(p);
+#endif /* QT_MAC_USE_COCOA */
                     e->setAutoFillBackground (true);
                     e->setBackgroundRole (QPalette::Highlight);
@@ -890 +897 @@
         aEditor->setGeometry (aOption.rect);
 }
+
+#ifdef QT_MAC_USE_COCOA
+bool VirtualSystemDelegate::eventFilter (QObject *aObject, QEvent *aEvent)
+{
+    if (aEvent->type() == QEvent::FocusOut)
+    {
+        /* On Mac OS X Cocoa the OS type selector widget loses it focus when
+         * the popup menu is shown. Prevent this here, cause otherwise the new
+         * selected OS will not be updated. */
+        VBoxOSTypeSelectorButton *button = qobject_cast<VBoxOSTypeSelectorButton*> (aObject);
+        if (button && button->isMenuShown())
+            return false;
+        /* The same counts for the text edit buttons of the license or
+         * description fields. */
+        else if (qobject_cast<VBoxLineTextEdit*> (aObject))
+            return false;
+    }
+
+    return QItemDelegate::eventFilter (aObject, aEvent);
+}
+#endif /* QT_MAC_USE_COCOA */
 
 ////////////////////////////////////////////////////////////////////////////////

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

@@ -21 +21 @@
  */
 
+/* VBox includes */
 #include "VBoxOSTypeSelectorButton.h"
 #include "VBoxGlobal.h"
 
+/* Qt includes */
 #include <QMenu>
 #include <QSignalMapper>
@@ -56 +58 @@
 }
 
+bool VBoxOSTypeSelectorButton::isMenuShown() const
+{
+    return mMainMenu->isVisible();
+}
+
 void VBoxOSTypeSelectorButton::retranslateUi()
 {