[EGIT] [core/efl] master 03/04: colorselector: Fix invalid API (orient vs. dir)

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9008dd88bcebc8a4378c3bbbcd23ff81f00fa167

commit 9008dd88bcebc8a4378c3bbbcd23ff81f00fa167
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Fri Aug 18 16:48:56 2017 +0900

    colorselector: Fix invalid API (orient vs. dir)
---
 src/lib/elementary/elm_colorselector.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/lib/elementary/elm_colorselector.c 
b/src/lib/elementary/elm_colorselector.c
index aa6404d4e5..1cce0027b3 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1857,6 +1857,16 @@ _palette_colors_load(Evas_Object *obj)
    sd->config_load = EINA_TRUE;
 }
 
+static inline void
+_palette_box_prepare(Eo *o, Eina_Bool legacy)
+{
+   if (legacy) efl_canvas_object_legacy_ctor(o);
+   efl_ui_direction_set(o, EFL_UI_DIR_HORIZONTAL);
+   efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   efl_gfx_visible_set(o, EINA_FALSE);
+}
+
 static void
 _create_colorpalette(Evas_Object *obj)
 {
@@ -1870,10 +1880,7 @@ _create_colorpalette(Evas_Object *obj)
 
    if (sd->palette_box) return;
    sd->palette_box = efl_add(EFL_UI_BOX_FLOW_CLASS, obj,
-                             efl_orientation_set(efl_added, 
EFL_ORIENT_HORIZONTAL),
-                             efl_gfx_size_hint_weight_set(efl_added, 
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
-                             efl_gfx_size_hint_align_set(efl_added, 
EVAS_HINT_FILL, EVAS_HINT_FILL),
-                             efl_gfx_visible_set(efl_added, EINA_FALSE));
+                             _palette_box_prepare(efl_added, wd->legacy));
 
    hpadstr = edje_object_data_get(wd->resize_obj, "horizontal_pad");
    if (hpadstr) h_pad = atoi(hpadstr);

--