Remove unnecessary constant from SelectActivity

Previously gengrid size was  expanded by POPUP_GENGRID_SIZE_FACTOR,
to avoid scaling errors, now UI uses Evas hints properly.

Method divideAndRoundOut was removed, as not needed anymore.

I've decided to leave return value in addItemsToMenu method.

Change-Id: Ia334b7cf079330fbe337220137299e6e7875121c

diff --git a/src/SelectActivity.cpp b/src/SelectActivity.cpp
index 42b3f02..655896d 100644 (file)
--- a/src/SelectActivity.cpp
+++ b/src/SelectActivity.cpp
@@ -20,7 +20,6 @@
 
 static const double    GENGRID_ITEM_HEIGHT_WIDTH_PROPORTION = 1.2;
 static const int       ITEMS_IN_GENGRID_PER_ROW             = 4;
-static const int       POPUP_GENGRID_SIZE_FACTOR            = 50;
 static const double    AUTO_TAP_WAITING_PERIOD_DEFAULT_TIME = 3.0;
 
 static const std::string AUTO_SCAN_KEY                      = VCONF_KEY_AUTO_SCAN_ENABLED;
@@ -68,7 +67,6 @@ private:
        static void gengridItemSelectedCb(void *, Evas_Object *, void *);
        static char *gengridItemLabelGetCb(void *, Evas_Object *, const char *);
        static Evas_Object *gengridItemContentGetCb(void *, Evas_Object *, const char *);
-       static int divideAndRoundOut(int, int);
 
        std::vector<std::string> nestedMenusLabels;
        VConfInterface::CallbackHandle callbackHandle;
@@ -188,7 +186,7 @@ void SelectActivity::createMenuContent()
 
        elm_layout_file_set(content, UNIVERSAL_SWITCH_EDJ, "universalSwitchTransparentLayout");
        elm_object_style_set(gengrid, "popup");
-       evas_object_size_hint_min_set(content, 1, 1);
+       evas_object_size_hint_min_set(content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_content_set(popup.get(), content);
        elm_object_part_content_set(content, "elm.swallow.content", gengrid);
 
@@ -203,11 +201,11 @@ void SelectActivity::createMenuContent()
        elm_gengrid_item_size_set(gengrid, itemWidth, itemHeight);
 
        auto completeLabelOfMenu = getCompleteLabelOfMenu();
-       auto numberOfItems = addItemsToMenu(gengrid, completeLabelOfMenu);
-       auto rows = divideAndRoundOut(numberOfItems, ITEMS_IN_GENGRID_PER_ROW);
+       addItemsToMenu(gengrid, completeLabelOfMenu);
 
-       evas_object_size_hint_min_set(gengrid, 1, itemHeight * rows + POPUP_GENGRID_SIZE_FACTOR);
+       evas_object_size_hint_min_set(gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_weight_set(gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_scroller_content_min_limit(gengrid, EINA_TRUE, EINA_TRUE);
 }
 
 void SelectActivity::addBackButton(Evas_Object *content)
@@ -463,11 +461,3 @@ void SelectActivity::gengridItemSelectedCb(void *data, Evas_Object *obj, void *e
        auto item = static_cast<Elm_Gengrid_Item *>(event_info);
        static_cast<SelectActivity *>(data)->gengridItemSelected(item);
 }
-
-
-int SelectActivity::divideAndRoundOut(int dividend, int divisor)
-{
-       ASSERT(divisor, "Zero divisor");
-
-       return (dividend + divisor - 1) / divisor;
-}