enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

widget: Implement mirrored from Efl.Ui.Base 

Ref T5363
This commit is contained in:
Jean-Philippe Andre 2017-06-13 19:41:15 +09:00
parent 5f2e4b9197
commit ed41adf791
38 changed files with 134 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/elementary/efl_ui_grid.c
View File

@ -119,7 +119,7 @@ _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
return int_ret;
}

2
src/lib/elementary/efl_ui_grid_static.c
View File

@ -42,7 +42,7 @@ _efl_ui_grid_static_efl_pack_layout_layout_update(Eo *obj, void *_pd EINA_UNUSED
yl = y;
wl = w;
hl = h;
mirror = elm_widget_mirrored_get(obj);
mirror = efl_ui_mirrored_get(obj);
if (!gd->req_cols || !gd->req_rows)
{

2
src/lib/elementary/efl_ui_progressbar.c
View File

@ -116,7 +116,7 @@ _val_set(Evas_Object *obj)
ELM_PROGRESSBAR_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
rtl = elm_widget_mirrored_get(obj);
rtl = efl_ui_mirrored_get(obj);
Efl_Ui_Progress_Status *ps;
Eina_List *l;

4
src/lib/elementary/efl_ui_slider.c
View File

@ -131,7 +131,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
if (_is_horizontal(sd->orientation)) pos2 = posx2;
else pos2 = posy2;
rtl = elm_widget_mirrored_get(obj);
rtl = efl_ui_mirrored_get(obj);
if ((!rtl && _is_inverted(sd->orientation)) ||
(rtl && ((sd->orientation == EFL_ORIENT_UP) ||
(sd->orientation == EFL_ORIENT_RIGHT))))
@ -192,7 +192,7 @@ _val_set(Evas_Object *obj)
else if (pos2 > 1.0)
pos2 = 1.0;
rtl = elm_widget_mirrored_get(obj);
rtl = efl_ui_mirrored_get(obj);
if ((!rtl && _is_inverted(sd->orientation)) ||
(rtl && ((sd->orientation == EFL_ORIENT_UP) ||
(sd->orientation == EFL_ORIENT_RIGHT))))

16
src/lib/elementary/efl_ui_text.c
View File

@ -488,7 +488,7 @@ _mirrored_set(Evas_Object *obj,
edje_object_mirrored_set(sd->entry_edje, rtl);
if (sd->anchor_hover.hover)
elm_widget_mirrored_set(sd->anchor_hover.hover, rtl);
efl_ui_mirrored_set(sd->anchor_hover.hover, rtl);
}
static void
@ -921,13 +921,13 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
evas_event_freeze(evas_object_evas_get(obj));
edje_object_mirrored_set
(wd->resize_obj, elm_widget_mirrored_get(obj));
(wd->resize_obj, efl_ui_mirrored_get(obj));
edje_object_scale_set
(wd->resize_obj,
efl_ui_scale_get(obj) * elm_config_scale_get());
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
elm_widget_theme_object_set
(obj, sd->entry_edje, "efl_ui_text", _efl_ui_text_theme_group_get(obj), style);
@ -985,7 +985,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
{
Elm_Theme_Apply ok = ELM_THEME_APPLY_FAILED;
elm_interface_scrollable_mirrored_set(obj, elm_widget_mirrored_get(obj));
elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj));
if (sd->single_line)
ok = elm_widget_theme_object_set
@ -2343,8 +2343,8 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
sd->anchor_hover.hover = elm_hover_add(obj);
evas_object_event_callback_add
(sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj);
elm_widget_mirrored_set
(sd->anchor_hover.hover, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set
(sd->anchor_hover.hover, efl_ui_mirrored_get(obj));
if (sd->anchor_hover.hover_style)
elm_object_style_set
(sd->anchor_hover.hover, sd->anchor_hover.hover_style);
@ -2372,7 +2372,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
if (py > (y + ((h * 2) / 3))) ei.hover_bottom = 0;
/* Swap right and left because they switch sides in RTL */
if (elm_widget_mirrored_get(sd->anchor_hover.hover))
if (efl_ui_mirrored_get(sd->anchor_hover.hover))
{
Eina_Bool tmp = ei.hover_left;
@ -3136,7 +3136,7 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
// if found - hook in
if ((priv->api) && (priv->api->obj_hook)) priv->api->obj_hook(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
// access
_elm_access_object_register(obj, priv->entry_edje);

2
src/lib/elementary/efl_ui_win.c
View File

@ -6207,7 +6207,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
elm_widget_style_get(obj));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
edje_object_mirrored_set(sd->legacy.edje, elm_widget_mirrored_get(obj));
edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
edje_object_scale_set(sd->legacy.edje,
efl_ui_scale_get(obj) * elm_config_scale_get());

12
src/lib/elementary/elc_combobox.c
View File

@ -78,16 +78,16 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
eina_stringshare_replace(&(wd->style), style);
mirrored = elm_widget_mirrored_get(obj);
mirrored = efl_ui_mirrored_get(obj);
if (sd->hover)
{
elm_widget_mirrored_set(sd->hover, mirrored);
efl_ui_mirrored_set(sd->hover, mirrored);
elm_widget_style_set(sd->hover, buf);
}
elm_widget_mirrored_set(sd->genlist, mirrored);
elm_widget_mirrored_set(sd->entry, mirrored);
efl_ui_mirrored_set(sd->genlist, mirrored);
efl_ui_mirrored_set(sd->entry, mirrored);
elm_widget_style_set(sd->genlist, buf);
elm_widget_style_set(sd->entry, buf);
@ -386,7 +386,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj);
elm_genlist_filter_set(gl, NULL);
elm_widget_mirrored_automatic_set(gl, EINA_FALSE);
elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set(gl, efl_ui_mirrored_get(obj));
evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(gl, "selected", _on_item_selected, obj);
@ -400,7 +400,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
// This is the entry object that will take over the entry call
sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj);
elm_widget_mirrored_automatic_set(entry, EINA_FALSE);
elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set(entry, efl_ui_mirrored_get(obj));
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
elm_entry_scrollable_set(entry, EINA_TRUE);

16
src/lib/elementary/elc_ctxpopup.c
View File

@ -403,7 +403,7 @@ _arrow_update(Evas_Object *obj,
case ELM_CTXPOPUP_DIRECTION_RIGHT:
edje_object_signal_emit(sd->arrow, "elm,state,left", "elm");
if (!edje_object_part_swallow(wd->resize_obj,
(elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_right" :
(efl_ui_mirrored_get(obj) ? "elm.swallow.arrow_right" :
"elm.swallow.arrow_left"), sd->arrow))
{
evas_object_hide(sd->arrow);
@ -421,7 +421,7 @@ _arrow_update(Evas_Object *obj,
drag = (double)(y) / (double)(base_size.h - arrow_size.h);
edje_object_part_drag_value_set
(wd->resize_obj,
(elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_right" :
(efl_ui_mirrored_get(obj) ? "elm.swallow.arrow_right" :
"elm.swallow.arrow_left"), 1, drag);
}
break;
@ -429,7 +429,7 @@ _arrow_update(Evas_Object *obj,
case ELM_CTXPOPUP_DIRECTION_LEFT:
edje_object_signal_emit(sd->arrow, "elm,state,right", "elm");
if (!edje_object_part_swallow(wd->resize_obj,
(elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_left" :
(efl_ui_mirrored_get(obj) ? "elm.swallow.arrow_left" :
"elm.swallow.arrow_right"), sd->arrow))
{
evas_object_hide(sd->arrow);
@ -447,7 +447,7 @@ _arrow_update(Evas_Object *obj,
drag = (double)(y) / (double)(base_size.h - arrow_size.h);
edje_object_part_drag_value_set
(wd->resize_obj,
(elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_left" :
(efl_ui_mirrored_get(obj) ? "elm.swallow.arrow_left" :
"elm.swallow.arrow_right"), 0, drag);
}
break;
@ -524,13 +524,13 @@ _show_signals_emit(Evas_Object *obj,
case ELM_CTXPOPUP_DIRECTION_LEFT:
elm_layout_signal_emit(obj,
(elm_widget_mirrored_get(obj) ? "elm,state,show,right" :
(efl_ui_mirrored_get(obj) ? "elm,state,show,right" :
"elm,state,show,left"), "elm");
break;
case ELM_CTXPOPUP_DIRECTION_RIGHT:
elm_layout_signal_emit(obj,
(elm_widget_mirrored_get(obj) ? "elm,state,show,left" :
(efl_ui_mirrored_get(obj) ? "elm,state,show,left" :
"elm,state,show,right"), "elm");
break;
@ -562,13 +562,13 @@ _hide_signals_emit(Evas_Object *obj,
case ELM_CTXPOPUP_DIRECTION_LEFT:
elm_layout_signal_emit(obj,
(elm_widget_mirrored_get(obj) ? "elm,state,hide,right" :
(efl_ui_mirrored_get(obj) ? "elm,state,hide,right" :
"elm,state,hide,left"), "elm");
break;
case ELM_CTXPOPUP_DIRECTION_RIGHT:
elm_layout_signal_emit(obj,
(elm_widget_mirrored_get(obj) ? "elm,state,hide,left" :
(efl_ui_mirrored_get(obj) ? "elm,state,hide,left" :
"elm,state,hide,right"), "elm");
break;

12
src/lib/elementary/elc_fileselector.c
View File

@ -169,11 +169,11 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
{
ELM_FILESELECTOR_DATA_GET(obj, sd);
elm_widget_mirrored_set(sd->cancel_button, rtl);
elm_widget_mirrored_set(sd->ok_button, rtl);
elm_widget_mirrored_set(sd->files_view, rtl);
elm_widget_mirrored_set(sd->up_button, rtl);
elm_widget_mirrored_set(sd->home_button, rtl);
efl_ui_mirrored_set(sd->cancel_button, rtl);
efl_ui_mirrored_set(sd->ok_button, rtl);
efl_ui_mirrored_set(sd->files_view, rtl);
efl_ui_mirrored_set(sd->up_button, rtl);
efl_ui_mirrored_set(sd->home_button, rtl);
}
static Eina_Bool
@ -215,7 +215,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
if (!int_ret) return ELM_THEME_APPLY_FAILED;
style = elm_widget_style_get(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);

4
src/lib/elementary/elc_fileselector_button.c
View File

@ -175,8 +175,8 @@ _activate(Elm_Fileselector_Button_Data *sd)
sd->fsw = _new_window_add(sd);
sd->fs = elm_fileselector_add(sd->fsw);
elm_widget_mirrored_set
(sd->fs, elm_widget_mirrored_get(sd->obj));
efl_ui_mirrored_set
(sd->fs, efl_ui_mirrored_get(sd->obj));
elm_widget_mirrored_automatic_set(sd->fs, EINA_FALSE);
elm_fileselector_expandable_set(sd->fs, sd->fsd.expandable);
elm_fileselector_folder_only_set(sd->fs, sd->fsd.folder_only);

4
src/lib/elementary/elc_fileselector_entry.c
View File

@ -221,7 +221,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
style = elm_widget_style_get(obj);
elm_widget_mirrored_set(sd->button, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set(sd->button, efl_ui_mirrored_get(obj));
if (elm_object_disabled_get(obj))
elm_layout_signal_emit(obj, "elm,state,disabled", "elm");
@ -323,7 +323,7 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
priv->button = elm_fileselector_button_add(obj);
elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE);
elm_widget_mirrored_set(priv->button, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set(priv->button, efl_ui_mirrored_get(obj));
elm_widget_style_set(priv->button, "fileselector_entry/default");
elm_fileselector_expandable_set

8
src/lib/elementary/elc_hoversel.c
View File

@ -90,7 +90,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
eina_stringshare_replace(&(wd->style), style);
if (sd->hover)
elm_widget_mirrored_set(sd->hover, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set(sd->hover, efl_ui_mirrored_get(obj));
if (sd->horizontal)
snprintf(buf, sizeof(buf), "hoversel_horizontal_entry/%s", style);
@ -330,7 +330,7 @@ _sizing_eval(void *data)
{
if ((base.x + base.w - parent.x) > ((parent.x + parent.w) - base.x))
{
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
elm_object_signal_emit(sd->hover, "elm,state,align,right", "elm");
else
elm_object_signal_emit(sd->hover, "elm,state,align,default", "elm");
@ -340,7 +340,7 @@ _sizing_eval(void *data)
}
else
{
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
elm_object_signal_emit(sd->hover, "elm,state,align,default", "elm");
else
elm_object_signal_emit(sd->hover, "elm,state,align,right", "elm");
@ -849,7 +849,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
elm_widget_style_get(obj));
VIEW(item) = bt = elm_button_add(obj);
elm_widget_mirrored_set(bt, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set(bt, efl_ui_mirrored_get(obj));
elm_object_style_set(bt, buf);
elm_object_text_set(bt, item->label);

2
src/lib/elementary/elc_multibuttonentry.c
View File

@ -1362,7 +1362,7 @@ _box_layout_cb(Evas_Object *o,
efl_gfx_size_hint_combined_min_get(o, &minw, &minh);
evas_object_size_hint_align_get(o, &ax, &ay);
rtl = elm_widget_mirrored_get(data);
rtl = efl_ui_mirrored_get(data);
if (rtl) ax = 1.0 - ax;
if (w < minw)

2
src/lib/elementary/elc_popup.c
View File

@ -362,7 +362,7 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
Eina_List *elist;
char buf[1024], style[1024];
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
elm_widget_style_set(sd->notify, style);

20
src/lib/elementary/elm_actionslider.c
View File

@ -49,7 +49,7 @@ static Elm_Actionslider_Pos
_get_pos_by_orientation(const Evas_Object *obj,
Elm_Actionslider_Pos pos)
{
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
{
switch (pos)
{
@ -161,10 +161,10 @@ _drag_button_move_cb(void *data,
(wd->resize_obj, "elm.drag_button_base", &pos, NULL);
if (EINA_DBL_EQ(pos, 0.0))
efl_event_callback_legacy_call
(obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right");
(obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !efl_ui_mirrored_get(obj) ? "left" : "right");
else if (EINA_DBL_EQ(pos, 1.0))
efl_event_callback_legacy_call
(obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left");
(obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !efl_ui_mirrored_get(obj) ? "right" : "left");
else if (pos >= 0.45 && pos <= 0.55)
efl_event_callback_legacy_call
(obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
@ -199,7 +199,7 @@ _button_animator(void *data)
{
double adjusted_final;
adjusted_final = (!elm_widget_mirrored_get(obj)) ?
adjusted_final = (!efl_ui_mirrored_get(obj)) ?
sd->final_position : 1.0 - sd->final_position;
if ((EINA_DBL_EQ(adjusted_final, 0.0)) ||
@ -279,8 +279,8 @@ _drag_button_up_cb(void *data,
_text_get(obj, &left, &right, &center);
if ((sd->enabled_position & ELM_ACTIONSLIDER_LEFT) &&
((!elm_widget_mirrored_get(obj) && EINA_DBL_EQ(position, 0.0)) ||
(elm_widget_mirrored_get(obj) && EINA_DBL_EQ(position, 1.0))))
((!efl_ui_mirrored_get(obj) && EINA_DBL_EQ(position, 0.0)) ||
(efl_ui_mirrored_get(obj) && EINA_DBL_EQ(position, 1.0))))
{
sd->final_position = 0;
efl_event_callback_legacy_call
@ -303,8 +303,8 @@ _drag_button_up_cb(void *data,
}
if ((sd->enabled_position & ELM_ACTIONSLIDER_RIGHT) &&
((!elm_widget_mirrored_get(obj) && EINA_DBL_EQ(position, 1)) ||
(elm_widget_mirrored_get(obj) && EINA_DBL_EQ(position, 0))))
((!efl_ui_mirrored_get(obj) && EINA_DBL_EQ(position, 1)) ||
(efl_ui_mirrored_get(obj) && EINA_DBL_EQ(position, 0))))
{
sd->final_position = 1;
efl_event_callback_legacy_call
@ -315,7 +315,7 @@ _drag_button_up_cb(void *data,
if (sd->magnet_position == ELM_ACTIONSLIDER_NONE) return;
#define _FIX_POS_ON_MIRROREDNESS(x) \
((!elm_widget_mirrored_get(obj)) ? x : 1.0 - x)
((!efl_ui_mirrored_get(obj)) ? x : 1.0 - x)
position = _FIX_POS_ON_MIRROREDNESS(position);
@ -438,7 +438,7 @@ static void
_mirrored_part_fix(const Evas_Object *obj,
const char **part)
{
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
{
/* exchange left and right */
if (!strcmp(*part, "left")) *part = "right";

2
src/lib/elementary/elm_box.c
View File

@ -174,7 +174,7 @@ _elm_box_custom_layout(Evas_Object *o,
ELM_BOX_DATA_GET(data, sd);
_els_box_layout(o, priv, sd->horizontal, sd->homogeneous,
elm_widget_mirrored_get(data));
efl_ui_mirrored_get(data));
}
static Eina_Bool

2
src/lib/elementary/elm_dayselector.c
View File

@ -95,7 +95,7 @@ _update_items(Evas_Object *obj)
if (last_day >= ELM_DAYSELECTOR_MAX)
last_day = last_day % ELM_DAYSELECTOR_MAX;
rtl = elm_widget_mirrored_get(obj);
rtl = efl_ui_mirrored_get(obj);
EINA_LIST_FOREACH(sd->items, l, it)
{
elm_object_signal_emit(VIEW(it), it->day_style, ""); // XXX: compat

16
src/lib/elementary/elm_entry.c
View File

@ -405,7 +405,7 @@ _mirrored_set(Evas_Object *obj,
edje_object_mirrored_set(sd->entry_edje, rtl);
if (sd->anchor_hover.hover)
elm_widget_mirrored_set(sd->anchor_hover.hover, rtl);
efl_ui_mirrored_set(sd->anchor_hover.hover, rtl);
}
static void
@ -856,13 +856,13 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
edje_object_part_text_hide_visible_password(sd->entry_edje, "elm.text");
edje_object_mirrored_set
(wd->resize_obj, elm_widget_mirrored_get(obj));
(wd->resize_obj, efl_ui_mirrored_get(obj));
edje_object_scale_set
(wd->resize_obj,
efl_ui_scale_get(obj) * elm_config_scale_get());
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
stl_user = eina_stringshare_add(edje_object_part_text_style_user_peek(sd->entry_edje, "elm.text"));
t = eina_stringshare_add(elm_object_text_get(obj));
@ -929,7 +929,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
{
Elm_Theme_Apply ok = ELM_THEME_APPLY_FAILED;
elm_interface_scrollable_mirrored_set(obj, elm_widget_mirrored_get(obj));
elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj));
if (sd->single_line)
ok = elm_widget_theme_object_set
@ -2535,8 +2535,8 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
sd->anchor_hover.hover = elm_hover_add(obj);
evas_object_event_callback_add
(sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj);
elm_widget_mirrored_set
(sd->anchor_hover.hover, elm_widget_mirrored_get(obj));
efl_ui_mirrored_set
(sd->anchor_hover.hover, efl_ui_mirrored_get(obj));
if (sd->anchor_hover.hover_style)
elm_object_style_set
(sd->anchor_hover.hover, sd->anchor_hover.hover_style);
@ -2564,7 +2564,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
if (py > (y + ((h * 2) / 3))) ei.hover_bottom = 0;
/* Swap right and left because they switch sides in RTL */
if (elm_widget_mirrored_get(sd->anchor_hover.hover))
if (efl_ui_mirrored_get(sd->anchor_hover.hover))
{
Eina_Bool tmp = ei.hover_left;
@ -3802,7 +3802,7 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
// if found - hook in
if ((priv->api) && (priv->api->obj_hook)) priv->api->obj_hook(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
// access
_elm_access_object_register(obj, priv->entry_edje);

20
src/lib/elementary/elm_gengrid.c
View File

@ -213,7 +213,7 @@ _item_cache_add(Elm_Gen_Item *it)
}
edje_object_mirrored_set(VIEW(it),
elm_widget_mirrored_get(WIDGET(it)));
efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(VIEW(it),
efl_ui_scale_get(WIDGET(it))
* elm_config_scale_get());
@ -445,7 +445,7 @@ _item_show_region(void *data)
else
{
col = sd->item_count / row;
if (elm_widget_mirrored_get(sd->obj))
if (efl_ui_mirrored_get(sd->obj))
{
if (sd->item_count % row == 0)
x = col - 1 - it->x;
@ -804,7 +804,7 @@ _item_mouse_move_cb(void *data,
{
const Efl_Event_Description *left_drag, *right_drag;
if (!elm_widget_mirrored_get(WIDGET(it)))
if (!efl_ui_mirrored_get(WIDGET(it)))
{
left_drag = EFL_UI_EVENT_DRAG_START_LEFT;
right_drag = EFL_UI_EVENT_DRAG_START_RIGHT;
@ -1121,7 +1121,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
(WIDGET(it), view, "gengrid", "item/default", "default");
}
edje_object_mirrored_set(view, elm_widget_mirrored_get(WIDGET(it)));
edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) *
elm_config_scale_get());
evas_object_stack_below(view, sd->stack);
@ -1810,7 +1810,7 @@ _item_place(Elm_Gen_Item *it,
+ (item->prev_group * wsd->group_item_width)) -
wsd->pan_x + ox + alignw + wsd->custom_size_sum[cy];
if (elm_widget_mirrored_get(WIDGET(it)))
if (efl_ui_mirrored_get(WIDGET(it)))
it->item->sw = wsd->custom_tot_sum[cy] - wsd->custom_size_sum[cy] - it->item->w;
else
it->item->sw = wsd->custom_size_sum[cy];
@ -1846,7 +1846,7 @@ _item_place(Elm_Gen_Item *it,
}
x = (cx * wsd->item_width) - wsd->pan_x + ox + alignw;
}
if (elm_widget_mirrored_get(WIDGET(it))) /* Switch items side
if (efl_ui_mirrored_get(WIDGET(it))) /* Switch items side
* and componsate for
* pan_x when in RTL
* mode */
@ -2209,7 +2209,7 @@ EOLIAN static void
_elm_gengrid_pan_elm_pan_pos_min_get(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord *x, Evas_Coord *y)
{
Evas_Coord mx = 0, my = 0;
Eina_Bool mirrored = elm_widget_mirrored_get(psd->wsd->obj);
Eina_Bool mirrored = efl_ui_mirrored_get(psd->wsd->obj);
elm_obj_pan_pos_max_get(obj, &mx, &my);
if (x)
@ -2708,7 +2708,7 @@ _elm_gengrid_item_edge_check(Elm_Object_Item *eo_it,
Evas_Coord cx = 0, cy = 0; //prev or next item's geometry
Elm_Object_Item *eo_item = NULL;
Elm_Gen_Item *tmp = it;
Eina_Bool mirrored = elm_widget_mirrored_get(WIDGET(it));
Eina_Bool mirrored = efl_ui_mirrored_get(WIDGET(it));
evas_object_geometry_get(VIEW(it), &ix, &iy, NULL, NULL);
@ -3325,7 +3325,7 @@ _key_action_move(Evas_Object *obj, const char *params)
Evas_Coord page_x = 0;
Evas_Coord page_y = 0;
Elm_Object_Item *it = NULL;
Eina_Bool mirrored = elm_widget_mirrored_get(obj);
Eina_Bool mirrored = efl_ui_mirrored_get(obj);
elm_interface_scrollable_content_pos_get(obj, &x, &y);
elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
@ -4050,7 +4050,7 @@ _elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
return int_ret;
}

10
src/lib/elementary/elm_genlist.c
View File

@ -554,7 +554,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
(WIDGET(it), view, "genlist", "item/default", "default");
}
edje_object_mirrored_set(view, elm_widget_mirrored_get(WIDGET(it)));
edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it))
* elm_config_scale_get());
@ -1418,7 +1418,7 @@ _decorate_all_item_realize(Elm_Gen_Item *it,
it->item->nostacking = !!strcmp("yes", stacking);
edje_object_mirrored_set
(it->deco_all_view, elm_widget_mirrored_get(WIDGET(it)));
(it->deco_all_view, efl_ui_mirrored_get(WIDGET(it)));
_elm_genlist_item_position_state_update(it);
_elm_genlist_item_state_update(it);
@ -1627,7 +1627,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
_item_mouse_callbacks_del(it, itc->base_view);
edje_object_mirrored_set(itc->base_view,
elm_widget_mirrored_get(WIDGET(it)));
efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(itc->base_view,
efl_ui_scale_get(WIDGET(it))
* elm_config_scale_get());
@ -3462,7 +3462,7 @@ _elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
if (!int_ret) return ELM_THEME_APPLY_FAILED;
evas_event_freeze(evas_object_evas_get(obj));
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
eina_hash_free_buckets(sd->size_caches);
sd->minw = sd->minh = sd->realminw = 0;
@ -5679,7 +5679,7 @@ _elm_genlist_efl_canvas_group_group_add(Eo *obj, Elm_Genlist_Data *priv)
edje_object_size_min_calc(wd->resize_obj, &minw, &minh);
evas_object_size_hint_min_set(obj, minw, minh);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
elm_layout_sizing_eval(obj);

2
src/lib/elementary/elm_grid.c
View File

@ -120,7 +120,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
return int_ret;
}

4
src/lib/elementary/elm_hover.c
View File

@ -249,7 +249,7 @@ _elm_hover_smt_sub_re_eval(Evas_Object *obj)
efl_event_callback_legacy_call
(obj, ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd->smt_sub->swallow);
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
{
if (sd->smt_sub == _HOV_BOTTOM_LEFT) sd->smt_sub = _HOV_BOTTOM_RIGHT;
else if (sd->smt_sub == _HOV_BOTTOM_RIGHT)
@ -331,7 +331,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd)
}
evas_object_geometry_get(obj, &x2, &y2, &w2, &h2);
if (elm_widget_mirrored_get(obj)) ofs_x = w - (x2 - x) - w2;
if (efl_ui_mirrored_get(obj)) ofs_x = w - (x2 - x) - w2;
else ofs_x = x2 - x;
if (y < 0)

4
src/lib/elementary/elm_index.c
View File

@ -66,7 +66,7 @@ _box_custom_layout(Evas_Object *o,
else
horizontal = EINA_FALSE;
_els_box_layout(o, priv, horizontal, EINA_TRUE, elm_widget_mirrored_get(data));
_els_box_layout(o, priv, horizontal, EINA_TRUE, efl_ui_mirrored_get(data));
}
static void
@ -233,7 +233,7 @@ _index_box_auto_fill(Evas_Object *obj,
if ((sd->omit_enabled) && (ih <= 0)) return;
rtl = elm_widget_mirrored_get(obj);
rtl = efl_ui_mirrored_get(obj);
EINA_LIST_FREE(sd->omit, om)
free(om);

2
src/lib/elementary/elm_layout.c
View File

@ -317,7 +317,7 @@ _visuals_refresh(Evas_Object *obj,
_parts_cursors_apply(sd);
edje_object_mirrored_set
(wd->resize_obj, elm_widget_mirrored_get(obj));
(wd->resize_obj, efl_ui_mirrored_get(obj));
edje_object_scale_set
(wd->resize_obj,

6
src/lib/elementary/elm_list.c
View File

@ -1102,7 +1102,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
EINA_LIST_FOREACH(sd->items, n, eo_it)
{
@ -2311,7 +2311,7 @@ _item_new(Evas_Object *obj,
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
_access_widget_item_register(it, EINA_TRUE);
edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj));
edje_object_mirrored_set(VIEW(it), efl_ui_mirrored_get(obj));
evas_object_event_callback_add
(VIEW(it), EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, it);
evas_object_event_callback_add
@ -2323,7 +2323,7 @@ _item_new(Evas_Object *obj,
evas_object_size_hint_weight_set
(VIEW(it), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj));
edje_object_mirrored_set(VIEW(it), efl_ui_mirrored_get(obj));
if (it->icon)
{

4
src/lib/elementary/elm_main.c
View File

@ -1401,14 +1401,14 @@ EAPI Eina_Bool
elm_object_mirrored_get(const Evas_Object *obj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
return elm_widget_mirrored_get(obj);
return efl_ui_mirrored_get(obj);
}
EAPI void
elm_object_mirrored_set(Evas_Object *obj, Eina_Bool mirrored)
{
EINA_SAFETY_ON_NULL_RETURN(obj);
elm_widget_mirrored_set(obj, mirrored);
efl_ui_mirrored_set(obj, mirrored);
}
EAPI Eina_Bool

12
src/lib/elementary/elm_menu.c
View File

@ -148,7 +148,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it)
}
/* If it overflows on the right, adjust the x */
if ((x_p + bw > px + pw) || elm_widget_mirrored_get(WIDGET(parent_it)))
if ((x_p + bw > px + pw) || efl_ui_mirrored_get(WIDGET(parent_it)))
x_p = x2 - bw;
/* If it overflows on the left, adjust the x - usually only happens
@ -204,7 +204,7 @@ _sizing_eval(Evas_Object *obj)
x_p = sd->xloc;
y_p = sd->yloc;
if (elm_widget_mirrored_get(obj)) x_p -= w_p;
if (efl_ui_mirrored_get(obj)) x_p -= w_p;
if (x_p + bw > x2 + w2) x_p -= x_p + bw - (x2 + w2);
if (x_p < x2) x_p = x2;
@ -628,7 +628,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
elm_interface_atspi_accessible_type_set(item->submenu.location, ELM_ATSPI_TYPE_DISABLED);
item->submenu.hv = hv = elm_hover_add(sd->bx);
elm_interface_atspi_accessible_type_set(item->submenu.hv, ELM_ATSPI_TYPE_SKIPPED);
elm_widget_mirrored_set(hv, EINA_FALSE);
efl_ui_mirrored_set(hv, EINA_FALSE);
elm_hover_target_set(hv, item->submenu.location);
elm_hover_parent_set(hv, sd->parent);
@ -646,7 +646,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
}
item->submenu.bx = bx = elm_box_add(sd->bx);
elm_widget_mirrored_set(bx, EINA_FALSE);
efl_ui_mirrored_set(bx, EINA_FALSE);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bx);
elm_object_part_content_set
@ -697,7 +697,7 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
priv->hv = elm_hover_add(obj);
elm_interface_atspi_accessible_type_set(priv->hv, ELM_ATSPI_TYPE_SKIPPED);
elm_widget_mirrored_set(priv->hv, EINA_FALSE);
efl_ui_mirrored_set(priv->hv, EINA_FALSE);
elm_object_style_set(priv->hv, "menu/default");
efl_event_callback_add
@ -705,7 +705,7 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
priv->bx = elm_box_add(obj);
elm_interface_atspi_accessible_type_set(priv->bx, ELM_ATSPI_TYPE_SKIPPED);
elm_widget_mirrored_set(priv->bx, EINA_FALSE);
efl_ui_mirrored_set(priv->bx, EINA_FALSE);
evas_object_size_hint_weight_set
(priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

4
src/lib/elementary/elm_notify.c
View File

@ -87,7 +87,7 @@ _notify_move_to_orientation(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_C
ax = sd->horizontal_align;
ay = sd->vertical_align;
if ((elm_widget_mirrored_get(obj)) && (ax != ELM_NOTIFY_ALIGN_FILL)) ax = 1.0 - ax;
if ((efl_ui_mirrored_get(obj)) && (ax != ELM_NOTIFY_ALIGN_FILL)) ax = 1.0 - ax;
if (ax == ELM_NOTIFY_ALIGN_FILL) minw = w;
if (ay == ELM_NOTIFY_ALIGN_FILL) minh = h;
@ -147,7 +147,7 @@ _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
int_ret &= _notify_theme_apply(obj);
if (sd->block_events) _block_events_theme_apply(obj);

26
src/lib/elementary/elm_panel.c
View File

@ -49,7 +49,7 @@ _mirrored_set(Evas_Object *obj,
ELM_PANEL_DATA_GET(obj, sd);
if ((sd->content) && (efl_isa(sd->content, ELM_WIDGET_CLASS)))
elm_widget_mirrored_set(sd->content, rtl);
efl_ui_mirrored_set(sd->content, rtl);
elm_panel_orient_set(obj, elm_panel_orient_get(obj));
}
@ -228,7 +228,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
if (sd->scrollable)
{
@ -376,7 +376,7 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
case ELM_PANEL_ORIENT_TOP:
break;
case ELM_PANEL_ORIENT_LEFT:
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
x = w * sd->content_size_ratio;
break;
@ -385,7 +385,7 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
break;
case ELM_PANEL_ORIENT_RIGHT:
if (!elm_widget_mirrored_get(obj))
if (!efl_ui_mirrored_get(obj))
x = w * sd->content_size_ratio;
break;
}
@ -413,7 +413,7 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
break;
case ELM_PANEL_ORIENT_LEFT:
if (!elm_widget_mirrored_get(obj))
if (!efl_ui_mirrored_get(obj))
x = w * sd->content_size_ratio;
horizontal = EINA_TRUE;
break;
@ -422,7 +422,7 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
break;
case ELM_PANEL_ORIENT_RIGHT:
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
x = w * sd->content_size_ratio;
horizontal = EINA_TRUE;
break;
@ -540,7 +540,7 @@ _state_sync(Evas_Object *obj)
panel_size = w * sd->content_size_ratio;
elm_interface_scrollable_content_pos_get(obj, &pos, NULL);
reverse ^= elm_widget_mirrored_get(obj);
reverse ^= efl_ui_mirrored_get(obj);
}
else
{
@ -618,7 +618,7 @@ _on_mouse_down(void *data,
Evas_Coord finger_size = elm_config_finger_size_get();
Evas_Coord x, y, w, h;
evas_object_geometry_get(obj, &x, &y, &w, &h);
Eina_Bool is_mirrored = elm_widget_mirrored_get(obj);
Eina_Bool is_mirrored = efl_ui_mirrored_get(obj);
sd->down_x = ev->canvas.x - x;
sd->down_y = ev->canvas.y - y;
@ -671,7 +671,7 @@ _on_mouse_move(void *data,
Evas_Coord x, y, w, h, cur_x, cur_y, finger_size;
evas_object_geometry_get(obj, &x, &y, &w, &h);
finger_size = elm_config_finger_size_get();
Eina_Bool is_mirrored = elm_widget_mirrored_get(obj);
Eina_Bool is_mirrored = efl_ui_mirrored_get(obj);
cur_x = ev->cur.canvas.x - x;
cur_y = ev->cur.canvas.y - y;
@ -883,7 +883,7 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
elm_layout_signal_callback_add
(obj, "elm,action,panel,toggle", "*", _panel_toggle, obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
priv->event = evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_color_set(priv->event, 0, 0, 0, 0);
@ -1168,7 +1168,7 @@ _anim_stop_cb(Evas_Object *obj, void *data EINA_UNUSED)
panel_size = w * sd->content_size_ratio;
elm_interface_scrollable_content_pos_get(obj, &pos, NULL);
reverse ^= elm_widget_mirrored_get(obj);
reverse ^= efl_ui_mirrored_get(obj);
}
else
{
@ -1254,7 +1254,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
event.rel_y = (double) y / (double) ((sd->content_size_ratio) * h);
break;
case ELM_PANEL_ORIENT_LEFT:
if (!elm_widget_mirrored_get(obj))
if (!efl_ui_mirrored_get(obj))
{
event.rel_x = 1 - ((double) x / (double) ((sd->content_size_ratio) * w));
event.rel_y = 1;
@ -1266,7 +1266,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
}
break;
case ELM_PANEL_ORIENT_RIGHT:
if (elm_widget_mirrored_get(obj))
if (efl_ui_mirrored_get(obj))
{
event.rel_x = 1 - ((double) x / (double) ((sd->content_size_ratio) * w));
event.rel_y = 1;

2
src/lib/elementary/elm_photo.c
View File

@ -59,7 +59,7 @@ _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
if (!int_ret) return ELM_THEME_APPLY_FAILED;
edje_object_mirrored_set
(wd->resize_obj, elm_widget_mirrored_get(obj));
(wd->resize_obj, efl_ui_mirrored_get(obj));
elm_widget_theme_object_set
(obj, wd->resize_obj, "photo", "base",

6
src/lib/elementary/elm_scroller.c
View File

@ -410,7 +410,7 @@ _elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
elm_layout_sizing_eval(obj);
@ -757,7 +757,7 @@ _loop_content_set(Evas_Object *obj, Elm_Scroller_Data *sd, Evas_Object *content)
elm_widget_on_show_region_hook_set(sd->contents, _show_region_hook, obj);
elm_widget_mirrored_automatic_set(sd->contents, EINA_FALSE);
elm_widget_mirrored_set(sd->contents, EINA_FALSE);
efl_ui_mirrored_set(sd->contents, EINA_FALSE);
}
elm_object_part_content_set(sd->contents, "elm.swallow.content", content);
sd->content = content;
@ -921,7 +921,7 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv)
evas_object_size_hint_min_set(obj, minw, minh);
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
elm_interface_scrollable_edge_left_cb_set(obj, _edge_left_cb);
elm_interface_scrollable_edge_right_cb_set(obj, _edge_right_cb);

8
src/lib/elementary/elm_segment_control.c
View File

@ -90,7 +90,7 @@ _position_items(Elm_Segment_Control_Data *sd)
evas_object_geometry_get
(wd->resize_obj, &bx, &by, &bw, &bh);
sd->item_width = bw / item_count;
rtl = elm_widget_mirrored_get(sd->obj);
rtl = efl_ui_mirrored_get(sd->obj);
if (rtl) pos = bx + bw - sd->item_width;
else pos = bx;
@ -169,7 +169,7 @@ _update_list(Elm_Segment_Control_Data *sd)
return;
}
rtl = elm_widget_mirrored_get(sd->obj);
rtl = efl_ui_mirrored_get(sd->obj);
EINA_LIST_FOREACH(sd->items, l, eo_it)
{
ELM_SEGMENT_ITEM_DATA_GET(eo_it, it);
@ -226,7 +226,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
rtl = elm_widget_mirrored_get(obj);
rtl = efl_ui_mirrored_get(obj);
EINA_LIST_FOREACH(sd->items, l, eo_item)
{
@ -604,7 +604,7 @@ _elm_segment_control_item_efl_object_constructor(Eo *obj, Elm_Segment_Control_It
elm_widget_sub_object_add(parent, VIEW(it));
elm_widget_theme_object_set
(parent, VIEW(it), "segment_control", "item", elm_object_style_get(parent));
edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(WIDGET(it)));
edje_object_mirrored_set(VIEW(it), efl_ui_mirrored_get(WIDGET(it)));
return obj;
}

2
src/lib/elementary/elm_spinner.c
View File

@ -341,7 +341,7 @@ _drag_cb(void *data,
/* Dragable is inverse of spinner value */
if (!strncmp(style, "vertical", 8)) delta *= -1;
/* If we are on rtl mode, change the delta to be negative on such changes */
if (elm_widget_mirrored_get(obj)) delta *= -1;
if (efl_ui_mirrored_get(obj)) delta *= -1;
if (_value_set(data, sd->val + delta)) _label_write(data);
sd->dragging = 1;
}

2
src/lib/elementary/elm_table.c
View File

@ -122,7 +122,7 @@ _elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
return int_ret;
}

12
src/lib/elementary/elm_toolbar.c
View File

@ -289,8 +289,8 @@ _item_mirrored_set(Evas_Object *obj EINA_UNUSED,
Elm_Toolbar_Item_Data *it,
Eina_Bool mirrored)
{
elm_widget_mirrored_set(VIEW(it), mirrored);
if (it->o_menu) elm_widget_mirrored_set(it->o_menu, mirrored);
efl_ui_mirrored_set(VIEW(it), mirrored);
if (it->o_menu) efl_ui_mirrored_set(it->o_menu, mirrored);
}
static void
@ -649,7 +649,7 @@ _resize_job(void *data)
}
eina_list_free(list);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
_item_focus_eval_all(obj, sd);
}
@ -1318,7 +1318,7 @@ _item_theme_hook(Evas_Object *obj,
style = elm_widget_style_get(obj);
_item_mirrored_set(obj, it, elm_widget_mirrored_get(obj));
_item_mirrored_set(obj, it, efl_ui_mirrored_get(obj));
edje_object_scale_set(elm_layout_edje_get(view), scale);
if (!it->separator && !it->object)
@ -1559,7 +1559,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
else
elm_object_signal_emit(sd->more, "elm,orient,horizontal", "elm");
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_mirrored_set(obj, efl_ui_mirrored_get(obj));
sd->theme_icon_size = _internal_elm_toolbar_icon_size_get(obj);
if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
@ -2321,7 +2321,7 @@ _layout(Evas_Object *o,
horizontal = sd->orientation ? EINA_TRUE : EINA_FALSE;
_els_box_layout
(o, priv, horizontal, sd->homogeneous, elm_widget_mirrored_get(obj));
(o, priv, horizontal, sd->homogeneous, efl_ui_mirrored_get(obj));
}
static char *

12
src/lib/elementary/elm_widget.c
View File

@ -1248,7 +1248,7 @@ _elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
*
**/
EOLIAN static Eina_Bool
_elm_widget_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
_elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
return sd->is_mirrored;
}
@ -1262,7 +1262,7 @@ _elm_widget_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
* @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset.
*/
EOLIAN static void
_elm_widget_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored)
_elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored)
{
mirrored = !!mirrored;
@ -1303,7 +1303,7 @@ _elm_widget_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool
if (automatic)
{
elm_widget_mirrored_set(obj, elm_config_mirrored_get());
efl_ui_mirrored_set(obj, elm_config_mirrored_get());
}
}
}
@ -1354,7 +1354,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
EOLIAN static Eina_Bool
_elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
{
Eina_Bool mirrored, pmirrored = elm_widget_mirrored_get(obj);
Eina_Bool mirrored, pmirrored = efl_ui_mirrored_get(obj);
EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE);
@ -1448,7 +1448,7 @@ _elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj
scale = efl_ui_scale_get(sobj);
th = elm_widget_theme_get(sobj);
mirrored = elm_widget_mirrored_get(sobj);
mirrored = efl_ui_mirrored_get(sobj);
if (!sdc->on_create)
{
@ -4154,7 +4154,7 @@ _elm_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_
EFL_DBG_INFO_APPEND(group, "Disabled", EINA_VALUE_TYPE_CHAR,
elm_widget_disabled_get(eo_obj));
EFL_DBG_INFO_APPEND(group, "Mirrored", EINA_VALUE_TYPE_CHAR,
elm_widget_mirrored_get(eo_obj));
efl_ui_mirrored_get(eo_obj));
EFL_DBG_INFO_APPEND(group, "Tree Unfocusable", EINA_VALUE_TYPE_CHAR,
elm_widget_tree_unfocusable_get(eo_obj));
EFL_DBG_INFO_APPEND(group, "Automatic mirroring", EINA_VALUE_TYPE_CHAR,

7
src/lib/elementary/elm_widget.eo
View File

@ -75,12 +75,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
tree_unfocusable: bool; [[$true for unfocusable, $false for focusable.]]
}
}
@property mirrored {
[[Control the widget's mirrored mode.]]
values {
mirrored: bool; [[$true if the widget is in mirrored mode, $false otherwise]]
}
}
@property theme {
[[Widget theme]]
values {
@ -833,6 +827,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
Efl.Ui.Focus.Object.focus_geometry { get; }
Efl.Ui.Focus.Object.focus { set; }
Efl.Ui.Base.scale { get; set; }
Efl.Ui.Base.mirrored { get; set; }
}
events {
moved; [[Called when widget moved]]

2
src/lib/elementary/elm_widget.h
View File

@ -729,8 +729,6 @@ EAPI int elm_widget_scroll_hold_get(const Evas_Object *obj);
EAPI void elm_widget_scroll_freeze_push(Evas_Object *obj);
EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj);
EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj);
EAPI Eina_Bool elm_widget_mirrored_get(const Evas_Object *obj);
EAPI void elm_widget_mirrored_set(Evas_Object *obj, Eina_Bool mirrored);
EAPI Eina_Bool elm_widget_mirrored_automatic_get(const Evas_Object *obj);
EAPI void elm_widget_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic);
EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th);