hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5262fe7b9902d894eec9a82021b50e9afeecaaf5
commit 5262fe7b9902d894eec9a82021b50e9afeecaaf5
Author: Jinyong Park <j4939.p...@samsung.com>
Date: Tue Jun 28 13:33:37 2016 +0900
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.
Reviewers: singh.amitesh, herb, Hermet, raster
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D4113
---
src/lib/elementary/elc_popup.c | 8 --------
src/lib/elementary/elm_widget_popup.h | 1 -
2 files changed, 9 deletions(-)
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 5ec3ca5..e99262c 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -405,10 +405,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)
@@ -477,10 +473,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/elementary/elm_widget_popup.h
b/src/lib/elementary/elm_widget_popup.h
index e0669c4..27e9a59 100644
--- a/src/lib/elementary/elm_widget_popup.h
+++ b/src/lib/elementary/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;
Eina_Bool visible : 1;
--
