From f8999f1811d262dd380e13a3af42d027838edd87 Mon Sep 17 00:00:00 2001 From: Jinyong Park Date: Tue, 28 Jun 2016 14:15:15 +0900 Subject: [PATCH] popup: remove max_sc_w because it's duplicate job Summary: max_sc_w decide popup's "content" area size when popup scrollable is TRUE. but in popup's edc, "elm/popup/content/XXXX" has min size when scrollable is TRUE. (and it is content area layout) max_sc_w has fixed value, so I think deciding by edc is better than fixed code. Test Plan: 1. elementary_test -to popup 2. check "Enable popup scroll" 3. click any list item. 4. observe popup and compare before this patch. Differential Revision: https://phab.enlightenment.org/D4113 Change-Id: I6bceeab859777724f6d064b73fe033a987e08d56 Signed-off-by: Jinyong Park --- src/lib/elc_popup.c | 8 -------- src/lib/elm_widget_popup.h | 1 - 2 files changed, 9 deletions(-) diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index d8af7a8..73e7967 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -536,10 +536,6 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,visible", "elm"); _populate_theme_scroll(sd); - if (sd->scroll && !sd->theme_scroll) - sd->max_sc_w = 240 * elm_config_scale_get() * elm_object_scale_get(obj); - else - sd->max_sc_w = 0; if (!sd->scroll && sd->theme_scroll) elm_layout_signal_emit(sd->content_area, "elm,scroll,disable", "elm"); else if (sd->scroll && sd->theme_scroll) @@ -633,10 +629,6 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd) edje_object_size_min_restricted_calc(elm_layout_edje_get(sd->content_area), &minw, &minh, minw, minh); - if (!sd->theme_scroll && sd->scroll) - { - if (minw < sd->max_sc_w) minw = sd->max_sc_w; - } evas_object_size_hint_min_set(sd->content_area, minw, minh); if (minh > sd->max_sc_h) diff --git a/src/lib/elm_widget_popup.h b/src/lib/elm_widget_popup.h index 76920de..980d513 100644 --- a/src/lib/elm_widget_popup.h +++ b/src/lib/elm_widget_popup.h @@ -48,7 +48,6 @@ struct _Elm_Popup_Data Action_Area_Data *buttons[ELM_POPUP_ACTION_BUTTON_MAX]; Elm_Wrap_Type content_text_wrap_type; unsigned int last_button_number; - Evas_Coord max_sc_w; Evas_Coord max_sc_h; //TIZEN_ONLY(20160623): Apply popup compress mode UX -- 2.7.4