Fixed|libappfw|MenuWidget: Take padding into account in layout

Also added a helper template method for getting widgets representing items.
skyjake · Feb 2, 2014 · 8b30915 · 8b30915
1 parent 43549b1
commit 8b30915
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/doomsday/libappfw/include/de/widgets/menuwidget.h b/doomsday/libappfw/include/de/widgets/menuwidget.h
@@ -94,6 +94,11 @@ class LIBAPPFW_PUBLIC MenuWidget : public ScrollAreaWidget
     ChildWidgetOrganizer &organizer();
     ChildWidgetOrganizer const &organizer() const;
 
+    template <typename WidgetType>
+    WidgetType &itemWidget(ui::Item const &item) const {
+        return organizer().itemWidget(item)->as<WidgetType>();
+    }
+
     /**
      * Returns the number of visible items in the menu. Hidden items are not
      * included in this count.

diff --git a/doomsday/libappfw/src/widgets/menuwidget.cpp b/doomsday/libappfw/src/widgets/menuwidget.cpp
@@ -385,13 +385,15 @@ void MenuWidget::setGridSize(int columns, ui::SizePolicy columnPolicy,
     if(d->colPolicy == ui::Filled)
     {
         DENG2_ASSERT(columns > 0);
-        d->layout.setOverrideWidth((rule().width() - margins().width()) / float(columns));
+        d->layout.setOverrideWidth((rule().width() - margins().width() -
+                                    (columns - 1) * d->layout.columnPadding()) / float(columns));
     }
 
     if(d->rowPolicy == ui::Filled)
     {
         DENG2_ASSERT(rows > 0);
-        d->layout.setOverrideHeight((rule().height() - margins().height()) / float(rows));
+        d->layout.setOverrideHeight((rule().height() - margins().height() -
+                                     (rows - 1) * d->layout.rowPadding()) / float(rows));
     }
 
     d->needLayout = true;