summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2015-06-23 09:46:30 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2015-06-23 09:46:30 +0200
commit85f20bcaa5e01286b4842c0eccc2b060b6fde257 (patch)
tree17d197cfd4c292c5f3636aa847d3ac226128828a
parent438d6aa9a9b72d14295d86eafdee8bfc48baacf1 (diff)
Revert "fileselector: Work around initial genlist size bug for release."
This reverts commit 64a4cf4c6847936f5074ad94bf9a8f2283609c3b. We finally found a proper fix for T2367 so we can safely revert this workaround.
-rw-r--r--src/lib/elc_fileselector.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 45a88dcb0..1ea2c01b9 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1236,24 +1236,6 @@ _files_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
1236 } 1236 }
1237} 1237}
1238 1238
1239/* FIXME: This is a dirty hack to avoid a broken layout on fileselector come up.
1240 * In some cases on some systems the genlist file view comes up with a height of
1241 * 10 and only resizes when interacted manually. This only papers over it for the
1242 * 1.14 release and will be removed from master directly afterwards. If we find
1243 * a solution we are able to backport this will also go away from the efl-1.14
1244 * stable branch. See T2367 for the full details.
1245 */
1246static void
1247_files_on_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o, void *event EINA_UNUSED)
1248{
1249 Evas_Coord x, y, w, h;
1250
1251 evas_object_geometry_get(o, &x, &y, &w, &h);
1252
1253 if (h < 20)
1254 evas_object_resize(o, 394, 279);
1255}
1256
1257static Evas_Object * 1239static Evas_Object *
1258_files_list_add(Evas_Object *obj) 1240_files_list_add(Evas_Object *obj)
1259{ 1241{
@@ -1276,7 +1258,6 @@ _files_list_add(Evas_Object *obj)
1276 evas_object_smart_callback_add(li, "expanded", _on_list_expanded, obj); 1258 evas_object_smart_callback_add(li, "expanded", _on_list_expanded, obj);
1277 evas_object_smart_callback_add(li, "contracted", _on_list_contracted, obj); 1259 evas_object_smart_callback_add(li, "contracted", _on_list_contracted, obj);
1278 evas_object_event_callback_add(li, EVAS_CALLBACK_KEY_DOWN, _files_key_down, obj); 1260 evas_object_event_callback_add(li, EVAS_CALLBACK_KEY_DOWN, _files_key_down, obj);
1279 evas_object_event_callback_add(li, EVAS_CALLBACK_RESIZE, _files_on_resize, obj);
1280 1261
1281 elm_widget_sub_object_add(obj, li); 1262 elm_widget_sub_object_add(obj, li);
1282 1263