Changeset 8338 in vbox

Timestamp:

Apr 23, 2008 5:35:48 PM (17 years ago)

Author:

vboxsync

Message:

1. Active combo-box now look highlighted & focused as it should be.
2. Added combo-box button (=scroll-bar for open combo-box) width to column width.
3. Pressing Ctrl-Up/Down or Space should not now cause the drop-down list to flicker twice (flickering doesn't happen when pressing F2).

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

@@ -179 +179 @@
     }
 
+    static int scrollBarWidth()
+    {
+        QListBox lb;
+        lb.setVScrollBarMode (QScrollView::AlwaysOn);
+        return lb.verticalScrollBar()->width();
+    }
+
     void setText (const QString &aText)
     {
@@ -475 +482 @@
         cb->resize (wc, hc);
 
-        if (aColumn == mFocusColumn && cb->isHidden())
-            cb->show();
+        if (aColumn == mFocusColumn)
+        {
+            if (cb->isHidden())
+                cb->show();
+            if (!cb->hasFocus())
+                cb->setFocus();
+        }
         else if (aColumn != mFocusColumn && !cb->isHidden())
             cb->hide();
@@ -515 +527 @@
 {
     mPrevItem = 0;
+    mCBFocusOut = false;
 
     /* toolbar */
@@ -895 +908 @@
 
             QMouseEvent *e = static_cast<QMouseEvent*> (aEvent);
-            QListViewItem *clickedItem = mLvHD->itemAt (QPoint (e->x(), e->y()));
+            QListViewItem *clickedItem = mLvHD->itemAt (e->pos());
             HDListItem *item = clickedItem &&
                 clickedItem->rtti() == HDListItem::HDListItemType ?
@@ -915 +928 @@
 
             QMouseEvent *e = static_cast<QMouseEvent*> (aEvent);
-            QListViewItem *hoveredItem = mLvHD->itemAt (QPoint (e->x(), e->y()));
+            QListViewItem *hoveredItem = mLvHD->itemAt (e->pos());
             HDListItem *item = hoveredItem &&
                 hoveredItem->rtti() == HDListItem::HDListItemType ?
@@ -933 +946 @@
         case QEvent::KeyPress:
         {
-            if (aObject != mLvHD)
+            if (!mLvHD->queryList (0, 0, false, true)->contains (aObject))
                 break;
 
@@ -947 +960 @@
                     item->focusColumn() > 0)
                 {
+                    mLvHD->setFocus();
                     item->moveFocusToColumn (item->focusColumn() - 1);
                     onAfterCurrentChanged (item);
                 }
+                return true;
             } else
             /* Process cursor-right as "move focus right" action */
@@ -957 +972 @@
                     item->focusColumn() < mLvHD->columns() - 1)
                 {
+                    mLvHD->setFocus();
                     item->moveFocusToColumn (item->focusColumn() + 1);
                     onAfterCurrentChanged (item);
                 }
+                return true;
+            } else
+            /* Process cursor-up as "move focus up" action */
+            if (e->key() == Qt::Key_Up && !e->state())
+            {
+                if (item && item->focusColumn() != -1 &&
+                    item->itemAbove())
+                {
+                    mLvHD->setFocus();
+                    mLvHD->setCurrentItem (item->itemAbove());
+                }
+                return true;
+            } else
+            /* Process cursor-up as "move focus up" action */
+            if (e->key() == Qt::Key_Down && !e->state())
+            {
+                if (item && item->focusColumn() != -1 &&
+                    item->itemBelow())
+                {
+                    mLvHD->setFocus();
+                    mLvHD->setCurrentItem (item->itemBelow());
+                }
+                return true;
             } else
             /* Process F2/Space as "open combo-box" actions */
@@ -967 +1006 @@
                 if (item)
                     item->showEditor();
+                return true;
             }
             /* Process Ctrl/Alt+Up/Down as "open combo-box" actions */
@@ -973 +1013 @@
             {
                 if (item)
-                {
                     item->showEditor();
-                    return true;
-                }
+                return true;
             }
             break;
@@ -983 +1021 @@
         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());
@@ -989 +1039 @@
             break;
         }
+        case QEvent::FocusOut:
+        {
+            if (aObject->className() == "HDSlotItem" ||
+                aObject->className() == "HDVdiItem")
+                mCBFocusOut = true;
+
+            break;
+        }
         default:
             break;
@@ -1010 +1068 @@
                 (int) (mLvHD->viewport()->width() * 0.4) : minLength;
 
-    mLvHD->setColumnWidth (0, minLength + 10 /* little spacing */);
+    mLvHD->setColumnWidth (0,
+                           minLength /* maximum string width */ +
+                           6 * 2 /* 2 combo-box margin */ +
+                           HDSlotItem::scrollBarWidth() /* scrollbar */);
     mLvHD->setColumnWidth (1, mLvHD->viewport()->width() - mLvHD->columnWidth (0));
 }