[EGIT] [core/enlightenment] master 02/02: use layout for theme import dialog

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=fb32300ea75bbc84cd201259689df071bb395520

commit fb32300ea75bbc84cd201259689df071bb395520
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed May 20 08:18:48 2015 -0400

    use layout for theme import dialog
    
    fixes min sizing
---
 src/modules/conf_theme/e_int_config_theme_import.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/modules/conf_theme/e_int_config_theme_import.c 
b/src/modules/conf_theme/e_int_config_theme_import.c
index 95d4dc3..98b8318 100644
--- a/src/modules/conf_theme/e_int_config_theme_import.c
+++ b/src/modules/conf_theme/e_int_config_theme_import.c
@@ -66,7 +66,9 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, 
_theme_import_cb_delete, NULL);
    
ecore_evas_name_class_set(ecore_evas_ecore_evas_get(evas_object_evas_get(win)), 
"E", "_theme_import_dialog");
 
-   o = edje_object_add(evas);
+   o = elm_layout_add(win);
+   E_EXPAND(o);
+   E_FILL(o);
    import->bg_obj = o;
    e_theme_edje_object_set(o, "base/theme/dialog", "e/widgets/dialog/main");
    elm_win_resize_object_add(win, o);
@@ -75,7 +77,7 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    o = e_widget_list_add(evas, 1, 1);
    e_widget_on_focus_hook_set(o, _theme_import_cb_wid_focus, import);
    import->box_obj = o;
-   edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
+   elm_object_part_content_set(import->bg_obj, "e.swallow.buttons", o);
 
    o = evas_object_rectangle_add(evas);
    import->event_obj = o;
@@ -110,7 +112,7 @@ e_int_config_theme_import(E_Config_Dialog *parent)
 
    e_widget_size_min_get(o, &w, &h);
    evas_object_size_hint_min_set(o, w, h);
-   edje_object_part_swallow(import->bg_obj, "e.swallow.content", o);
+   elm_object_part_content_set(import->bg_obj, "e.swallow.content", o);
    evas_object_show(o);
 
    import->ok_obj = e_widget_button_add(evas, _("OK"), NULL,
@@ -129,13 +131,8 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    o = import->box_obj;
    e_widget_size_min_get(o, &w, &h);
    evas_object_size_hint_min_set(o, w, h);
-   edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
+   elm_object_part_content_set(import->bg_obj, "e.swallow.buttons", o);
 
-   edje_object_size_min_calc(import->bg_obj, &w, &h);
-   evas_object_resize(import->bg_obj, w, h);
-   evas_object_resize(win, w, h);
-   evas_object_size_hint_min_set(win, w, h);
-   evas_object_size_hint_max_set(win, 99999, 99999);
    evas_object_show(win);
    e_win_client_icon_set(win, "preferences-desktop-theme");
 

--