[diskselector] opensource merge - fix datetime issue

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 35f98c6..f30f8cf 100644 (file)
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -376,6 +376,7 @@ static void
 _theme_data_get(Widget_Data *wd)
 {
    const char* str;
+   Evas_Object *parent;
    str = edje_object_data_get(wd->right_blank, "len_threshold");
    if (str) wd->len_threshold = MAX(0, atoi(str));
    else wd->len_threshold = 0;
@@ -388,11 +389,16 @@ _theme_data_get(Widget_Data *wd)
      }
 
    str = edje_object_data_get(wd->right_blank, "min_width");
-   if (str) wd->minw = MAX(-1, atoi(str));
-   else wd->minw = -1;
+   if (str) wd->minw = MAX(-1, atoi(str)) * elm_scale_get();
+   else
+     {
+        parent = elm_widget_parent_widget_get(wd->self);
+        if (!parent) wd->minw = -1;
+        else evas_object_geometry_get(parent, NULL, NULL, &wd->minw, NULL);
+     }
 
    str = edje_object_data_get(wd->right_blank, "min_height");
-   if (str) wd->minh = MAX(-1, atoi(str));
+   if (str) wd->minh = MAX(-1, atoi(str)) * elm_scale_get();
    else wd->minh = -1;
 }