efl_ui/popup: remove popup_size property

this was more or less just a wrapper around efl_gfx_entity_size_set
and resulted in unpredictable behavior depending on when it was called

instead, simply set the min size hint on the popup object

ref T7902

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D9549

9 files changed, 41 insertions, 85 deletions

diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index cf809106c1..8ac846cdff 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -59,7 +59,7 @@ _create_popup(efl_ui_popup_data *p_data)
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_POPUP_EVENT_BACKWALL_CLICKED, _backwall_clicked, NULL);
    efl_event_callback_add(efl_ui_popup, EFL_UI_POPUP_EVENT_TIMEOUT, _timeout_cb, p_data);
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(160, 160));
 
    Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
    efl_text_set(btn, "Efl.Ui.Popup");
@@ -194,9 +194,9 @@ _popup_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
    static Eina_Bool size_changed = EINA_FALSE;
 
    if (!size_changed)
-     efl_ui_popup_size_set(p_data->efl_ui_popup, EINA_SIZE2D(300, 160));
+     efl_gfx_hint_size_min_set(p_data->efl_ui_popup, EINA_SIZE2D(300, 160));
    else
-     efl_ui_popup_size_set(p_data->efl_ui_popup, EINA_SIZE2D(160, 120));
+     efl_gfx_hint_size_min_set(p_data->efl_ui_popup, EINA_SIZE2D(160, 120));
 
    size_changed = !size_changed;
 }
@@ -403,7 +403,7 @@ _alert_scroll_case1_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    efl_ui_alert_popup_button_set(efl_ui_popup, EFL_UI_ALERT_POPUP_BUTTON_NEGATIVE, "No", NULL);
    efl_ui_alert_popup_button_set(efl_ui_popup, EFL_UI_ALERT_POPUP_BUTTON_USER, "Cancel", NULL);
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(160, 160));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_alert_popup_clicked_cb, NULL);
 }
@@ -429,7 +429,7 @@ _alert_scroll_case2_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    //This is beta API for now. So EFL_UI_SCROLL_ALERT_POPUP_BETA should be defined.
    efl_ui_scroll_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(320, -1));
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(160, 160));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_alert_popup_clicked_cb, NULL);
 }
@@ -455,7 +455,7 @@ _alert_scroll_case3_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    //This is beta API for now. So EFL_UI_SCROLL_ALERT_POPUP_BETA should be defined.
    efl_ui_scroll_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(-1, 320));
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(160, 160));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_alert_popup_clicked_cb, NULL);
 }
@@ -481,7 +481,7 @@ _alert_scroll_case4_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    //This is beta API for now. So EFL_UI_SCROLL_ALERT_POPUP_BETA should be defined.
    efl_ui_scroll_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(320, 320));
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(160, 160));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_alert_popup_clicked_cb, NULL);
 }
@@ -507,7 +507,7 @@ _alert_scroll_case5_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    //This is beta API for now. So EFL_UI_SCROLL_ALERT_POPUP_BETA should be defined.
    efl_ui_scroll_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(80, 80));
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(160, 160));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_alert_popup_clicked_cb, NULL);
 }
@@ -584,7 +584,7 @@ _alert_text_case1_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    efl_ui_alert_popup_button_set(efl_ui_popup, EFL_UI_ALERT_POPUP_BUTTON_NEGATIVE, "No", NULL);
    efl_ui_alert_popup_button_set(efl_ui_popup, EFL_UI_ALERT_POPUP_BUTTON_USER, "Cancel", NULL);
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 }
@@ -598,7 +598,7 @@ _alert_text_case2_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Eina_Strbuf *message_buf = eina_strbuf_new();
    create_message(message_buf, "This is Text Popup ", 50);
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_text_set(efl_part(efl_ui_popup, "title"), "title");
    efl_text_set(efl_ui_popup, eina_strbuf_string_get(message_buf));
@@ -618,7 +618,7 @@ _alert_text_case3_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Eo *win = data;
    Eo *efl_ui_popup= efl_add(EFL_UI_TEXT_ALERT_POPUP_CLASS, win);
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(300, 300));
 
    efl_text_set(efl_part(efl_ui_popup, "title"), "title");
@@ -637,7 +637,7 @@ _alert_text_case4_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Eo *win = data;
    Eo *efl_ui_popup= efl_add(EFL_UI_TEXT_ALERT_POPUP_CLASS, win);
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_text_set(efl_part(efl_ui_popup, "title"), "title");
    efl_text_set(efl_ui_popup, "This is Text Popup");
@@ -666,7 +666,7 @@ _alert_text_case5_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(-1, 300));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 }
 
@@ -688,7 +688,7 @@ _alert_text_case6_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(300, 300));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -704,7 +704,7 @@ _alert_text_case7_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Eina_Strbuf *message_buf = eina_strbuf_new();
    create_message(message_buf, "This is Text Popup ", 50);
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_text_set(efl_part(efl_ui_popup, "title"), "title");
    efl_text_set(efl_ui_popup, eina_strbuf_string_get(message_buf));
@@ -738,7 +738,7 @@ _alert_text_case8_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(-1, 300));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -763,7 +763,7 @@ _alert_text_case9_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(10, 10));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -788,7 +788,7 @@ _alert_text_case10_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(150, 150));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -813,7 +813,7 @@ _alert_text_case11_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(150, -1));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -838,7 +838,7 @@ _alert_text_case12_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(300, -1));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -863,7 +863,7 @@ _alert_text_case13_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(-1, 150));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
@@ -888,7 +888,7 @@ _alert_text_case14_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 
    efl_ui_text_alert_popup_expandable_set(efl_ui_popup, EINA_SIZE2D(-1, 300));
 
-   efl_ui_popup_size_set(efl_ui_popup, EINA_SIZE2D(200, 200));
+   efl_gfx_hint_size_min_set(efl_ui_popup, EINA_SIZE2D(200, 200));
 
    efl_event_callback_add(efl_ui_popup, EFL_UI_ALERT_POPUP_EVENT_BUTTON_CLICKED, efl_ui_text_alert_popup_clicked_cb, NULL);
 
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 2331b4468b..5cc54e56ca 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -138,18 +138,6 @@ _efl_ui_popup_align_get(const Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd)
    return pd->align;
 }
 
-EOLIAN static void
-_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size)
-{
-   efl_gfx_entity_size_set(obj, size);
-}
-
-EOLIAN static Eina_Size2D
-_efl_ui_popup_popup_size_get(const Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED)
-{
-   return efl_gfx_entity_size_get(obj);
-}
-
 static Eina_Bool
 _timer_cb(void *data)
 {
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 4fc5548e6b..37a0104741 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -36,17 +36,6 @@ class @beta Efl.Ui.Popup extends Efl.Ui.Layout_Base implements Efl.Content, Efl.
              time: double; [[Timeout in seconds]]
          }
       }
-      @property popup_size {
-         set {
-            [[Set the popup size.]]
-         }
-         get {
-            [[get the current popup size.]]
-         }
-         values {
-            size: Eina.Size2D;
-         }
-      }
    }
    parts {
       backwall: Efl.Ui.Popup_Part_Backwall; [[A backwall behind the popup.]]
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index 1bc757422a..37311883fb 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -19,7 +19,7 @@ static void
 _scroller_sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd,
                       Eina_Size2D obj_min, Eina_Size2D scr_min)
 {
-   Eina_Size2D max_size;
+   Eina_Size2D max_size, min_size;
    max_size.w = -1;
    max_size.h = -1;
 
@@ -28,9 +28,11 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd,
    if (pd->max_size.h != -1)
      max_size.h = (obj_min.h > pd->max_size.h) ? obj_min.h : pd->max_size.h;
 
+   min_size = efl_gfx_hint_size_min_get(obj);
+
    Eina_Size2D size;
-   size.w = (obj_min.w > pd->size.w) ? obj_min.w : pd->size.w;
-   size.h = (obj_min.h > pd->size.h) ? obj_min.h : pd->size.h;
+   size.w = (obj_min.w > min_size.w) ? obj_min.w : min_size.w;
+   size.h = (obj_min.h > min_size.h) ? obj_min.h : min_size.h;
 
    Eina_Size2D new_min = obj_min;
 
@@ -246,16 +248,6 @@ _efl_ui_scroll_alert_popup_expandable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Scro
    return pd->max_size;
 }
 
-EOLIAN static void
-_efl_ui_scroll_alert_popup_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd, Eina_Size2D size)
-{
-   pd->size = size;
-
-   efl_gfx_entity_size_set(obj, size);
-
-   efl_canvas_group_change(obj);
-}
-
 EOLIAN static Eo *
 _efl_ui_scroll_alert_popup_efl_object_constructor(Eo *obj,
                                                   Efl_Ui_Scroll_Alert_Popup_Data *pd)
@@ -275,7 +267,6 @@ _efl_ui_scroll_alert_popup_efl_object_constructor(Eo *obj,
    efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.content"),
                    pd->scroller);
 
-   pd->size = EINA_SIZE2D(0, 0);
    pd->max_size = EINA_SIZE2D(-1, -1);
 
    return obj;
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.eo b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
index fb9aeb2558..8f75b5a44e 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
@@ -28,6 +28,5 @@ class @beta Efl.Ui.Scroll_Alert_Popup extends Efl.Ui.Alert_Popup
       Efl.Object.constructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Part.part_get;
-      Efl.Ui.Popup.popup_size { set;}
    }
 }
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.c b/src/lib/elementary/efl_ui_text_alert_popup.c
index ad0c222d5f..6fc625d3d2 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.c
+++ b/src/lib/elementary/efl_ui_text_alert_popup.c
@@ -20,7 +20,7 @@
 static void
 _scroller_sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, Eina_Size2D obj_min, Eina_Size2D text_min)
 {
-   Eina_Size2D max_size;
+   Eina_Size2D max_size, min_size;
    max_size.w = -1;
    max_size.h = -1;
 
@@ -29,9 +29,11 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, Eina_Size2D obj
    if (pd->max_size.h != -1)
      max_size.h = (obj_min.h > pd->max_size.h) ? obj_min.h : pd->max_size.h;
 
+  min_size = efl_gfx_hint_size_min_get(obj);
+
   Eina_Size2D size;
-  size.w = (obj_min.w > pd->size.w) ? obj_min.w : pd->size.w;
-  size.h = (obj_min.h > pd->size.h) ? obj_min.h : pd->size.h;
+  size.w = (obj_min.w > min_size.w) ? obj_min.w : min_size.w;
+  size.h = (obj_min.h > min_size.h) ? obj_min.h : min_size.h;
 
   text_min.w = (obj_min.w > text_min.w) ? obj_min.w : text_min.w;
   text_min.h = (obj_min.h > text_min.h) ? obj_min.h : text_min.h;
@@ -107,16 +109,6 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, Eina_Size2D obj
     efl_gfx_hint_size_restricted_min_set(obj, new_min);
 }
 
-EOLIAN static void
-_efl_ui_text_alert_popup_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, Eina_Size2D size)
-{
-   pd->size = size;
-
-   efl_gfx_entity_size_set(obj, size);
-
-   efl_canvas_group_change(obj);
-}
-
 static void
 _sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd)
 {
@@ -284,7 +276,6 @@ _efl_ui_text_alert_popup_efl_object_constructor(Eo *obj,
    efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.content"),
                    pd->scroller);
 
-   pd->size = EINA_SIZE2D(0, 0);
    pd->max_size = EINA_SIZE2D(-1, -1);
 
    return obj;
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.eo b/src/lib/elementary/efl_ui_text_alert_popup.eo
index 0f684866c7..b8e48da770 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_text_alert_popup.eo
@@ -21,7 +21,6 @@ class @beta Efl.Ui.Text_Alert_Popup extends Efl.Ui.Alert_Popup implements Efl.Te
    implements {
       Efl.Object.constructor;
       Efl.Canvas.Group.group_calculate;
-      Efl.Ui.Popup.popup_size { set;}
       Efl.Text.text { get; set; }
       Efl.Part.part_get;
    }
diff --git a/src/lib/elementary/efl_ui_text_alert_popup_private.h b/src/lib/elementary/efl_ui_text_alert_popup_private.h
index 88dd6b2133..f07d460f1a 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup_private.h
+++ b/src/lib/elementary/efl_ui_text_alert_popup_private.h
@@ -8,7 +8,6 @@ struct _Efl_Ui_Text_Alert_Popup_Data
 {
    Eo *scroller;
    Eo *message;
-   Eina_Size2D size;
    Eina_Size2D max_size;
 };
 
diff --git a/src/tests/elementary/efl_ui_test_popup.c b/src/tests/elementary/efl_ui_test_popup.c
index 844520357f..0c161dc366 100644
--- a/src/tests/elementary/efl_ui_test_popup.c
+++ b/src/tests/elementary/efl_ui_test_popup.c
@@ -66,7 +66,7 @@ EFL_START_TEST(efl_ui_test_popup_basic_align)
    efl_gfx_entity_size_set(win, EINA_SIZE2D(WIN_SIZE, WIN_SIZE));
 
    popup = efl_add(EFL_UI_POPUP_CLASS, win);
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
 
    Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, popup);
    efl_text_set(btn, "Efl.Ui.Popup");
@@ -150,7 +150,7 @@ EFL_START_TEST(efl_ui_test_popup_basic_sizing)
    efl_gfx_entity_size_set(win, EINA_SIZE2D(WIN_SIZE, WIN_SIZE));
 
    popup = efl_add(EFL_UI_POPUP_CLASS, win);
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
 
    Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, popup);
    efl_text_set(btn, "Efl.Ui.Popup");
@@ -179,7 +179,7 @@ EFL_START_TEST(efl_ui_test_popup_events)
    efl_event_callback_add(popup, EFL_UI_POPUP_EVENT_BACKWALL_CLICKED,
      (void*)event_callback_that_is_called_exactly_one_time_and_sets_a_single_int_data_pointer_when_called, &called);
    efl_event_callback_add(popup, EFL_UI_POPUP_EVENT_TIMEOUT, event_callback_that_quits_the_main_loop_when_called, NULL);
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
 
    Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, popup);
    efl_text_set(btn, "Efl.Ui.Popup");
@@ -294,7 +294,7 @@ EFL_START_TEST(efl_ui_test_popup_scroll_alert)
    Eina_Size2D popup_sz_min;
    Eina_Size2D layout_sz_min = _popup_scroll_alert_setup(&popup, &layout);
 
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
    get_me_to_those_events(popup);
 
    /* base popup size without content */
@@ -333,7 +333,7 @@ EFL_START_TEST(efl_ui_test_popup_scroll_alert_expand)
 
    /* first test horizontal expand */
    efl_ui_scroll_alert_popup_expandable_set(popup, EINA_SIZE2D(POPUP_SIZE_EXPAND, -1));
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
    efl_canvas_group_calculate(popup);
 
 
@@ -359,7 +359,7 @@ EFL_START_TEST(efl_ui_test_popup_scroll_alert_expand)
 
    /* now expand vertically */
    efl_ui_scroll_alert_popup_expandable_set(popup, EINA_SIZE2D(-1, POPUP_SIZE_EXPAND));
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
    efl_canvas_group_calculate(popup);
 
    /* base popup size without content */
@@ -386,7 +386,7 @@ EFL_START_TEST(efl_ui_test_popup_scroll_alert_expand)
 
    /* now both */
    efl_ui_scroll_alert_popup_expandable_set(popup, EINA_SIZE2D(POPUP_SIZE_EXPAND, POPUP_SIZE_EXPAND));
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
    efl_canvas_group_calculate(popup);
 
    /* base popup size without content */
@@ -418,7 +418,7 @@ EFL_START_TEST(efl_ui_test_popup_scroll_alert_expand)
 
    /* now use a confining expand which ignores content min size */
    efl_ui_scroll_alert_popup_expandable_set(popup, EINA_SIZE2D(POPUP_SIZE / 2, POPUP_SIZE / 2));
-   efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
    efl_canvas_group_calculate(popup);
 
    {
@@ -498,6 +498,7 @@ EFL_START_TEST(efl_ui_test_popup_text_alert)
 
    get_me_to_those_events(popup);
    popup_sz_min1 = efl_gfx_hint_size_combined_min_get(popup);
+   efl_gfx_hint_size_min_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
 
    for (i = 0; i < num_tests; i++)
      {
@@ -511,7 +512,6 @@ EFL_START_TEST(efl_ui_test_popup_text_alert)
 
         efl_text_set(popup, eina_strbuf_string_get(buf));
         efl_ui_text_alert_popup_expandable_set(popup, test_expands[i]);
-        efl_ui_popup_size_set(popup, EINA_SIZE2D(POPUP_SIZE, POPUP_SIZE));
         efl_canvas_group_calculate(popup);
 
         /* get internal label object: VERY illegal */