Changeset 8370 in vbox for trunk/src/VBox

Timestamp:

Apr 24, 2008 4:49:18 PM (17 years ago)

Author:

vboxsync

Message:

Fixed crash in SATA ui under Win32, list focusing fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxHardDiskSettings.ui (modified) (1 diff)
• VBoxHardDiskSettings.ui.h (modified) (13 diffs)

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

@@ -271 +271 @@
     <variable access="private">CMachine mMachine;</variable>
     <variable access="private">QPopupMenu *mContextMenu;</variable>
-    <variable access="private">bool mCBFocusOut;</variable>
 </variables>
 <signals>

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

@@ -345 +345 @@
         , mMachine (aMachine)
         , mFocusColumn (-1)
+        , mAutoFocus (false)
     {
         init();
@@ -407 +408 @@
     {
         mFocusColumn = aCol;
+        mAutoFocus = mFocusColumn != -1;
         repaint();
+    }
+
+    void setAutoFocus (bool aOn)
+    {
+        mAutoFocus = aOn;
     }
 
@@ -486 +493 @@
             if (cb->isHidden())
                 cb->show();
-            if (!cb->hasFocus())
-                cb->setFocus();
+            if (mAutoFocus && !cb->hasFocus())
+                QTimer::singleShot (0, cb, SLOT (setFocus()));
         }
         else if (aColumn != mFocusColumn && !cb->isHidden())
@@ -512 +519 @@
     QPtrVector<QComboBox>  mVector;
     int                    mFocusColumn;
+    bool                   mAutoFocus;
 };
 
@@ -527 +535 @@
 {
     mPrevItem = 0;
-    mCBFocusOut = false;
 
     /* toolbar */
@@ -823 +830 @@
     if (aItem != mPrevItem)
     {
+        int prevFocusColumn =
+            mPrevItem && mPrevItem->rtti() == HDListItem::HDListItemType ?
+            static_cast<HDListItem*> (mPrevItem)->focusColumn() : 0;
+
+        if (mPrevItem && mPrevItem->rtti() == HDListItem::HDListItemType)
+            static_cast<HDListItem*> (mPrevItem)->moveFocusToColumn (-1);
+
         if (aItem && aItem->rtti() == HDListItem::HDListItemType &&
             static_cast<HDListItem*> (aItem)->focusColumn() == -1)
-        {
-            int prevFocusColumn = 0;
-            if (mPrevItem && mPrevItem->rtti() == HDListItem::HDListItemType)
-                prevFocusColumn = static_cast<HDListItem*> (mPrevItem)->focusColumn();
             static_cast<HDListItem*> (aItem)->moveFocusToColumn (prevFocusColumn);
-        }
-
-        if (mPrevItem && mPrevItem->rtti() == HDListItem::HDListItemType)
-            static_cast<HDListItem*> (mPrevItem)->moveFocusToColumn (-1);
 
         mPrevItem = aItem;
@@ -960 +966 @@
                     item->focusColumn() > 0)
                 {
+                    item->setAutoFocus (false);
                     mLvHD->setFocus();
                     item->moveFocusToColumn (item->focusColumn() - 1);
@@ -972 +979 @@
                     item->focusColumn() < mLvHD->columns() - 1)
                 {
+                    item->setAutoFocus (false);
                     mLvHD->setFocus();
                     item->moveFocusToColumn (item->focusColumn() + 1);
@@ -984 +992 @@
                     item->itemAbove())
                 {
+                    item->setAutoFocus (false);
                     mLvHD->setFocus();
                     mLvHD->setCurrentItem (item->itemAbove());
@@ -989 +998 @@
                 return true;
             } else
-            /* Process cursor-up as "move focus up" action */
+            /* Process cursor-down as "move focus down" action */
             if (e->key() == Qt::Key_Down && !e->state())
             {
@@ -995 +1004 @@
                     item->itemBelow())
                 {
+                    item->setAutoFocus (false);
                     mLvHD->setFocus();
                     mLvHD->setCurrentItem (item->itemBelow());
@@ -1015 +1025 @@
                     item->showEditor();
                 return true;
+            } else
+            if ((e->key() == Qt::Key_Tab && !e->state()) ||
+                e->key() == Qt::Key_Backtab)
+            {
+                item->setAutoFocus (false);
+                mLvHD->setFocus();
             }
             break;
@@ -1021 +1037 @@
         case QEvent::FocusIn:
         {
-            if (aObject == mLvHD ||
-                aObject->inherits ("HDSlotItem") ||
-                aObject->inherits ("HDVdiItem"))
-                mCBFocusOut = false;
-            else if (mCBFocusOut)
-            {
-                mCBFocusOut = false;
-                mLvHD->setFocus();
-                focusNextPrevChild (true);
-                return true;
-            }
-
             if (aObject == mLvHD)
                 onAfterCurrentChanged (mLvHD->currentItem());
             else if (!mGbHDList->queryList (0, 0, false, true)->contains (aObject))
                 onAfterCurrentChanged (0);
-            break;
-        }
-        case QEvent::FocusOut:
-        {
-            if (aObject->className() == "HDSlotItem" ||
-                aObject->className() == "HDVdiItem")
-                mCBFocusOut = true;
 
             break;