libappfw|MenuWidget: Finding item index based on widget

skyjake · Apr 23, 2016 · 4a4a211 · 4a4a211
1 parent 499d530
commit 4a4a211
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/doomsday/sdk/libappfw/include/de/widgets/menuwidget.h b/doomsday/sdk/libappfw/include/de/widgets/menuwidget.h
@@ -110,6 +110,16 @@ class LIBAPPFW_PUBLIC MenuWidget : public ScrollAreaWidget, public IAssetGroup
         return organizer().itemWidget(item)->as<WidgetType>();
     }
 
+    template <typename WidgetType>
+    WidgetType *itemWidget(ui::DataPos itemPos) const {
+        if(itemPos < items().size()) {
+            return organizer().itemWidget(items().at(itemPos))->maybeAs<WidgetType>();
+        }
+        return nullptr;
+    }
+
+    ui::DataPos findItem(GuiWidget const &widget) const;
+
     /**
      * Returns the number of visible items in the menu. Hidden items are not
      * included in this count.

diff --git a/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp
@@ -551,6 +551,15 @@ ChildWidgetOrganizer const &MenuWidget::organizer() const
     return d->organizer;
 }
 
+ui::DataPos MenuWidget::findItem(GuiWidget const &widget) const
+{
+    if(auto const *item = organizer().findItemForWidget(widget))
+    {
+        return items().find(*item);
+    }
+    return ui::Data::InvalidPos;
+}
+
 void MenuWidget::update()
 {
     if(d->needLayout)

diff --git a/doomsday/sdk/libappfw/src/widgets/scrollareawidget.cpp b/doomsday/sdk/libappfw/src/widgets/scrollareawidget.cpp
@@ -499,7 +499,7 @@ void ScrollAreaWidget::scrollToRight(TimeDelta span)
 void ScrollAreaWidget::scrollToWidget(GuiWidget const &widget, TimeDelta span)
 {
     int off = widget.rule().midY().valuei() - contentRule().top().valuei() -
-            rule().height().valuei()/2;
+              rule().height().valuei()/2;
     scrollY(off, span);
 }