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

Timestamp:

Mar 27, 2019 2:38:22 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: A bit of cleanup for makeSureItemIsVisible API.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItem.h (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (3 diffs)
• UIChooserItemGroup.h (modified) (1 diff)
• UIChooserModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h

@@ -186 +186 @@
         /** Makes sure item is visible. */
         virtual void makeSureItsVisible();
-        /** Makes sure passed @a pItem is visible within the current root item.
-          * @note Please keep in mind that any group item can be a root, but there
-          * is just one model root item at the same time, accessible via model's
-          * root() getter, and this API can be called for current root item only,
-          * because this is root item who performs actual scrolling, while
-          * @a pItem itself can be on any level of embedding. */
-        virtual void makeSureItemIsVisible(UIChooserItem *pItem) { Q_UNUSED(pItem); }
 
         /** Returns pixmap item representation. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -140 +140 @@
 }
 
-/* static */
-QString UIChooserItemGroup::className()
-{
-    return "UIChooserItemGroup";
-}
-
 void UIChooserItemGroup::makeSureItemIsVisible(UIChooserItem *pItem)
 {
@@ -157 +151 @@
     const QRectF itemRectInGroup = QRectF(positionInGroup, pItem->size());
     m_pScrollArea->makeSureRectIsVisible(itemRectInGroup);
+}
+
+/* static */
+QString UIChooserItemGroup::className()
+{
+    return "UIChooserItemGroup";
 }
 
@@ -262 +262 @@
     /* Make sure item visible: */
     if (model()->root())
-        model()->root()->makeSureItemIsVisible(this);
+        model()->root()->toGroupItem() ->makeSureItemIsVisible(this);
 
     /* Assign name-editor text: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

@@ -90 +90 @@
     /** @name Navigation stuff.
       * @{ */
+        /** Makes sure passed @a pItem is visible within the current root item.
+          * @note Please keep in mind that any group item can be a root, but there
+          * is just one model root item at the same time, accessible via model's
+          * root() getter, and this API can be called for current root item only,
+          * because this is root item who performs actual scrolling, while
+          * @a pItem itself can be on any level of embedding. */
+        void makeSureItemIsVisible(UIChooserItem *pItem) /* override */;
+
         /** Class-name used for drag&drop mime-data format. */
         static QString className();
-        /** Makes sure passed child @a pItem is visible. */
-        virtual void makeSureItemIsVisible(UIChooserItem *pItem) /* override */;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -414 +414 @@
     if (view() && view()->window() && root())
         if (view()->window()->isVisible() && pItem)
-            root()->makeSureItemIsVisible(pItem);
+            root()->toGroupItem()->makeSureItemIsVisible(pItem);
 }