[Popup] Upstream merging r69492

Change-Id: I84ccbec86b71aec628790385767aadff1aee30ec

diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index d3f0a5e..2ab11c6 100644 (file)
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -173,7 +173,6 @@ _theme_hook(Evas_Object *obj)
 
    if (!wd) return;
    elm_layout_theme_set(wd->base, "popup", "base", elm_widget_style_get(obj));
-   elm_widget_scale_set(wd->base, elm_widget_scale_get(obj));
    _elm_widget_mirrored_reload(obj);
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
    if (wd->button_count)
@@ -1033,6 +1032,7 @@ _focus_next_hook(const Evas_Object *obj __UNUSED__,
    //TODO: Implement Focus chanin Handling in Popup for action area buttons
    return EINA_FALSE;
 }
+
 static void
 _item_text_set(Elm_Popup_Content_Item *item, const char *label)
 {