NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

colorselector: Switch to Efl.Ui.Box internally 

This doesn't change anything (in theory) but was to test the
box implementation. Conclusion: it's not much better than
elm_box. Also, homogenous mode isn't set because the layout
is completely broken (+ sets a min size equal to the object
size, thus can not resize down ever). The palette's objects
have the same size anyway.
This commit is contained in:
Jean-Philippe Andre 2017-01-05 17:15:42 +09:00
parent a6e54c6109
commit b11f371703
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/lib/elementary/elm_colorselector.c
View File

@ -1312,6 +1312,8 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
(sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_ALL) ||
(sd->mode == ELM_COLORSELECTOR_BOTH)) (sd->mode == ELM_COLORSELECTOR_BOTH))
{ {
double scale;
hpadstr = edje_object_data_get hpadstr = edje_object_data_get
(wd->resize_obj, "horizontal_pad"); (wd->resize_obj, "horizontal_pad");
if (hpadstr) h_pad = atoi(hpadstr); if (hpadstr) h_pad = atoi(hpadstr);
@ -1319,10 +1321,8 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
(wd->resize_obj, "vertical_pad"); (wd->resize_obj, "vertical_pad");
if (vpadstr) v_pad = atoi(vpadstr); if (vpadstr) v_pad = atoi(vpadstr);
elm_box_padding_set scale = elm_widget_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
(sd->palette_box, efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
(h_pad * elm_widget_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj)),
(v_pad * elm_widget_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj)));
EINA_LIST_FOREACH(sd->items, elist, eo_item) EINA_LIST_FOREACH(sd->items, elist, eo_item)
{ {
@ -1506,10 +1506,9 @@ _elm_colorselector_elm_layout_sizing_eval(Eo *obj, Elm_Colorselector_Data *sd)
return; return;
} }
elm_box_recalculate(sd->palette_box); efl_pack_layout_request(sd->palette_box);
edje_object_size_min_calc(wd->resize_obj, &minw, &minh); edje_object_size_min_calc(wd->resize_obj, &minw, &minh);
evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, -1, -1);
} }
static void static void
@ -1808,7 +1807,7 @@ _palette_colors_load(Evas_Object *obj)
item->color->b = color->b; item->color->b = color->b;
item->color->a = color->a; item->color->a = color->a;
elm_box_pack_end(sd->palette_box, VIEW(item)); efl_pack(sd->palette_box, VIEW(item));
evas_object_color_set(item->color_obj, evas_object_color_set(item->color_obj,
(item->color->r * item->color->a) / 255, (item->color->r * item->color->a) / 255,
(item->color->g * item->color->a) / 255, (item->color->g * item->color->a) / 255,
@ -1827,32 +1826,25 @@ _create_colorpalette(Evas_Object *obj)
const char *hpadstr, *vpadstr; const char *hpadstr, *vpadstr;
unsigned int h_pad = DEFAULT_HOR_PAD; unsigned int h_pad = DEFAULT_HOR_PAD;
unsigned int v_pad = DEFAULT_VER_PAD; unsigned int v_pad = DEFAULT_VER_PAD;
double scale;
ELM_COLORSELECTOR_DATA_GET(obj, sd); ELM_COLORSELECTOR_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd->palette_box) return; if (sd->palette_box) return;
sd->palette_box = elm_box_add(obj); sd->palette_box = efl_add(EFL_UI_BOX_FLOW_CLASS, obj,
elm_box_layout_set efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL),
(sd->palette_box, evas_object_box_layout_flow_horizontal, NULL, NULL); efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
elm_box_horizontal_set(sd->palette_box, EINA_TRUE); efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL));
evas_object_size_hint_weight_set
(sd->palette_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set
(sd->palette_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_homogeneous_set(sd->palette_box, EINA_TRUE);
hpadstr = edje_object_data_get(wd->resize_obj, "horizontal_pad"); hpadstr = edje_object_data_get(wd->resize_obj, "horizontal_pad");
if (hpadstr) h_pad = atoi(hpadstr); if (hpadstr) h_pad = atoi(hpadstr);
vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad"); vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad");
if (vpadstr) v_pad = atoi(vpadstr); if (vpadstr) v_pad = atoi(vpadstr);
elm_box_padding_set scale = elm_widget_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
(sd->palette_box, efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
(h_pad * elm_widget_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj)), efl_pack_align_set(sd->palette_box, 0.0, 0.0);
(v_pad * elm_widget_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj)));
elm_box_align_set(sd->palette_box, 0.0, 0.0);
if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box)) if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box))
elm_layout_content_set(obj, "palette", sd->palette_box); elm_layout_content_set(obj, "palette", sd->palette_box);
sd->palette_name = eina_stringshare_add("default"); sd->palette_name = eina_stringshare_add("default");
@ -2452,7 +2444,7 @@ _elm_colorselector_palette_color_add(Eo *obj, Elm_Colorselector_Data *sd, int r,
item->color->b = b; item->color->b = b;
item->color->a = a; item->color->a = a;
elm_box_pack_end(sd->palette_box, VIEW(item)); efl_pack(sd->palette_box, VIEW(item));
evas_object_color_set(item->color_obj, evas_object_color_set(item->color_obj,
(item->color->r * item->color->a) / 255, (item->color->r * item->color->a) / 255,
(item->color->g * item->color->a) / 255, (item->color->g * item->color->a) / 255,