zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b5a917c12005302520ab3d9a93661ad003e3dcaf
commit b5a917c12005302520ab3d9a93661ad003e3dcaf
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Fri Sep 27 08:40:35 2019 -0400
theme: replace hbar and vbar to horizontal_bar and vertical_bar
Summary:
To make clear the meaning, hbar and vbar are replaced to horizontal_bar
and vertical_bar.
Reviewers: zmike, woohyun, segfaultxavi
Reviewed By: zmike, segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10217
---
data/elementary/themes/edc/efl/collection.edc | 4 +-
data/elementary/themes/edc/efl/grid.edc | 8 +-
data/elementary/themes/edc/efl/image_zoomable.edc | 4 +-
data/elementary/themes/edc/efl/list.edc | 8 +-
data/elementary/themes/edc/efl/scroller.edc | 96 +++++++++++------------
data/elementary/themes/edc/efl/text.edc | 4 +-
src/lib/elementary/efl_ui_image_zoomable.c | 60 +++++++-------
src/lib/elementary/efl_ui_scroll_util.c | 64 +++++++--------
src/lib/elementary/elm_interface_scrollable.c | 4 +-
9 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/data/elementary/themes/edc/efl/collection.edc
b/data/elementary/themes/edc/efl/collection.edc
index 0b73b87856..d2e4ba6dba 100644
--- a/data/elementary/themes/edc/efl/collection.edc
+++ b/data/elementary/themes/edc/efl/collection.edc
@@ -1,7 +1,7 @@
/**
Group: efl/collection (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
diff --git a/data/elementary/themes/edc/efl/grid.edc
b/data/elementary/themes/edc/efl/grid.edc
index 809d76fc09..a57a120038 100644
--- a/data/elementary/themes/edc/efl/grid.edc
+++ b/data/elementary/themes/edc/efl/grid.edc
@@ -1,7 +1,7 @@
/**
Group: efl/grid (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
@@ -19,8 +19,8 @@ Group: efl/grid_item (@since 1.23)
Signal: efl,state,selected
Signal: efl,state,unselected
Group: efl/view_grid (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
diff --git a/data/elementary/themes/edc/efl/image_zoomable.edc
b/data/elementary/themes/edc/efl/image_zoomable.edc
index 833a58ae2f..6b3e905f63 100644
--- a/data/elementary/themes/edc/efl/image_zoomable.edc
+++ b/data/elementary/themes/edc/efl/image_zoomable.edc
@@ -1,7 +1,7 @@
/**
Group: efl/image_zoomable (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
diff --git a/data/elementary/themes/edc/efl/list.edc
b/data/elementary/themes/edc/efl/list.edc
index 09502fb84b..e96ee028a1 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -1,7 +1,7 @@
/**
Group: efl/list (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
@@ -35,8 +35,8 @@ Group: efl/list_item:placeholder (@since 1.23)
Signal: efl,state,unpressed
Signal: efl,state,unselected
Group: efl/list_view (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
diff --git a/data/elementary/themes/edc/efl/scroller.edc
b/data/elementary/themes/edc/efl/scroller.edc
index ead5705bb2..a0bb08836a 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -1,7 +1,7 @@
/**
Group: efl/scroller (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
@@ -11,8 +11,8 @@ Group: efl/scroller (@since 1.23)
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
Group: efl/scroller:noclip (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
@@ -22,8 +22,8 @@ Group: efl/scroller:noclip (@since 1.23)
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
Group: efl/scroller:popup/no_inset_shadow (@since 1.23)
- Part Rectangle: efl.dragable.hbar (required)
- Part Rectangle: efl.dragable.vbar (required)
+ Part Rectangle: efl.dragable.horizontal_bar (required)
+ Part Rectangle: efl.dragable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
@@ -191,7 +191,7 @@ group { name: "efl/scroller";
rel1.relative: 0.0 1.0;
rel1.to: "sb_vbar_a1";
rel2.relative: 1.0 0.0;
- rel2.to: "efl.dragable.vbar";
+ rel2.to: "efl.dragable.vertical_bar";
fixed: 1 1;
}
}
@@ -200,13 +200,13 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 0.0 1.0;
- rel1.to: "efl.dragable.vbar";
+ rel1.to: "efl.dragable.vertical_bar";
rel2.relative: 1.0 0.0;
rel2.to: "sb_vbar_a2";
fixed: 1 1;
}
}
- part { name: "efl.dragable.vbar"; type: RECT; required;
+ part { name: "efl.dragable.vertical_bar"; type: RECT; required;
clip_to: "sb_vbar";
scale: 1;
dragable.x: 0 0 0;
@@ -254,8 +254,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 0.0;
- rel1.to: "efl.dragable.vbar";
- rel2.to: "efl.dragable.vbar";
+ rel1.to: "efl.dragable.vertical_bar";
+ rel2.to: "efl.dragable.vertical_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -288,8 +288,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 1.0;
- rel1.to: "efl.dragable.vbar";
- rel2.to: "efl.dragable.vbar";
+ rel1.to: "efl.dragable.vertical_bar";
+ rel2.to: "efl.dragable.vertical_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -340,7 +340,7 @@ group { name: "efl/scroller";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
target: "sb_vbar_a1";
target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
@@ -355,7 +355,7 @@ group { name: "efl/scroller";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
target: "sb_vbar_a1";
target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
@@ -379,7 +379,7 @@ group { name: "efl/scroller";
}
program { name: "drag_up";
action: DRAG_VAL_STEP 0.0 -1.0;
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
@@ -395,17 +395,17 @@ group { name: "efl/scroller";
}
program { name: "drag_down";
action: DRAG_VAL_STEP 0.0 1.0;
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0;
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0;
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
}
program {
signal: "efl,action,scroll"; source: "efl";
@@ -458,7 +458,7 @@ group { name: "efl/scroller";
rel1.relative: 1.0 0.0;
rel1.to: "sb_hbar_a1";
rel2.relative: 0.0 1.0;
- rel2.to: "efl.dragable.hbar";
+ rel2.to: "efl.dragable.horizontal_bar";
fixed: 1 1;
}
}
@@ -467,13 +467,13 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 1.0 0.0;
- rel1.to: "efl.dragable.hbar";
+ rel1.to: "efl.dragable.horizontal_bar";
rel2.relative: 0.0 1.0;
rel2.to: "sb_hbar_a2";
fixed: 1 1;
}
}
- part { name: "efl.dragable.hbar"; type: RECT; required;
+ part { name: "efl.dragable.horizontal_bar"; type: RECT; required;
clip_to: "sb_hbar";
scale: 1;
dragable.x: 1 1 0;
@@ -521,8 +521,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 0.0 1.0;
- rel1.to: "efl.dragable.hbar";
- rel2.to: "efl.dragable.hbar";
+ rel1.to: "efl.dragable.horizontal_bar";
+ rel2.to: "efl.dragable.horizontal_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -555,8 +555,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 1.0 1.0;
- rel1.to: "efl.dragable.hbar";
- rel2.to: "efl.dragable.hbar";
+ rel1.to: "efl.dragable.horizontal_bar";
+ rel2.to: "efl.dragable.horizontal_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -607,7 +607,7 @@ group { name: "efl/scroller";
action: STATE_SET "default" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
target: "sb_hbar_a1";
target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
@@ -622,7 +622,7 @@ group { name: "efl/scroller";
action: STATE_SET "hidden" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
target: "sb_hbar_a1";
target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
@@ -646,7 +646,7 @@ group { name: "efl/scroller";
}
program { name: "drag_left";
action: DRAG_VAL_STEP -1.0 0.0;
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_a2";
@@ -662,17 +662,17 @@ group { name: "efl/scroller";
}
program { name: "drag_right";
action: DRAG_VAL_STEP 1.0 0.0;
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0;
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0;
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
}
program {
signal: "efl,action,scroll"; source: "efl";
@@ -909,9 +909,9 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
fixed: 1 1;
rel1.offset: 2 0;
- rel1.to: "efl.dragable.vbar";
+ rel1.to: "efl.dragable.vertical_bar";
rel2.offset: -3 -1;
- rel2.to: "efl.dragable.vbar";
+ rel2.to: "efl.dragable.vertical_bar";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 3 13;
@@ -1070,9 +1070,9 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
fixed: 1 1;
rel1.offset: 0 2;
- rel1.to: "efl.dragable.hbar";
+ rel1.to: "efl.dragable.horizontal_bar";
rel2.offset: -1 -3;
- rel2.to: "efl.dragable.hbar";
+ rel2.to: "efl.dragable.horizontal_bar";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 13 3;
@@ -1127,51 +1127,51 @@ group { name: "efl/scroller";
}
programs {
program {
- signal: "mouse,down,1*"; source: "efl.dragable.vbar";
+ signal: "mouse,down,1*"; source: "efl.dragable.vertical_bar";
action: STATE_SET "clicked" 0.0;
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
- signal: "mouse,down,*"; source: "efl.dragable.vbar";
+ signal: "mouse,down,*"; source: "efl.dragable.vertical_bar";
action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.vbar";
+ signal: "mouse,up,1"; source: "efl.dragable.vertical_bar";
action: STATE_SET "default" 0.0;
- target: "efl.dragable.vbar";
+ target: "efl.dragable.vertical_bar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
- signal: "mouse,up,*"; source: "efl.dragable.vbar";
+ signal: "mouse,up,*"; source: "efl.dragable.vertical_bar";
action: SIGNAL_EMIT "efl,vbar,unpress" "efl";
}
program {
- signal: "mouse,down,1*"; source: "efl.dragable.hbar";
+ signal: "mouse,down,1*"; source: "efl.dragable.horizontal_bar";
action: STATE_SET "clicked" 0.0;
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
- signal: "mouse,down,*"; source: "efl.dragable.hbar";
+ signal: "mouse,down,*"; source: "efl.dragable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.hbar";
+ signal: "mouse,up,1"; source: "efl.dragable.horizontal_bar";
action: STATE_SET "default" 0.0;
- target: "efl.dragable.hbar";
+ target: "efl.dragable.horizontal_bar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
- signal: "mouse,up,*"; source: "efl.dragable.hbar";
+ signal: "mouse,up,*"; source: "efl.dragable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
}
}
diff --git a/data/elementary/themes/edc/efl/text.edc
b/data/elementary/themes/edc/efl/text.edc
index 3bbba5645e..8f4a1df939 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -185,7 +185,7 @@ group { "efl/text/single/scroller";
visible: 0;
}
}
- part { name: "efl.dragable.vbar"; type: RECT;
+ part { name: "efl.dragable.vertical_bar"; type: RECT;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
dragable.confine: "sb_vbar_base";
@@ -205,7 +205,7 @@ group { "efl/text/single/scroller";
visible: 0;
}
}
- part { name: "efl.dragable.hbar"; type: RECT;
+ part { name: "efl.dragable.horizontal_bar"; type: RECT;
dragable.x: 1 1 0;
dragable.y: 0 0 0;
dragable.confine: "sb_hbar_base";
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c
b/src/lib/elementary/efl_ui_image_zoomable.c
index 910854ee16..5d22591569 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1367,9 +1367,9 @@ _efl_ui_image_zoomable_bar_read_and_update(Eo *obj)
else
{
edje_object_part_drag_value_get
- (wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
+ (wd->resize_obj, "efl.dragable.vertical_bar", NULL, &vy);
edje_object_part_drag_value_get
- (wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
+ (wd->resize_obj, "efl.dragable.horizontal_bar", &vx, NULL);
}
efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
}
@@ -1505,8 +1505,8 @@ _efl_ui_image_zoomable_bar_size_changed_cb(void *data,
const Efl_Event *event EI
}
else
{
- edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar",
width, 1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar",
1.0, height);
+ edje_object_part_drag_size_set(wd->resize_obj,
"efl.dragable.horizontal_bar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj,
"efl.dragable.vertical_bar", 1.0, height);
}
}
@@ -1528,8 +1528,8 @@ _efl_ui_image_zoomable_bar_pos_changed_cb(void *data,
const Efl_Event *event EIN
}
else
{
- edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar",
posx, 0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar",
0.0, posy);
+ edje_object_part_drag_value_set(wd->resize_obj,
"efl.dragable.horizontal_bar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj,
"efl.dragable.vertical_bar", 0.0, posy);
}
}
@@ -1640,22 +1640,22 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
efl_layout_signal_callback_add
(obj, "reload", "efl", obj, _efl_ui_image_zoomable_reload_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag", "efl.dragable.vbar",
+ (obj, "drag", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,set", "efl.dragable.vbar",
+ (obj, "drag,set", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,start", "efl.dragable.vbar",
+ (obj, "drag,start", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,stop", "efl.dragable.vbar",
+ (obj, "drag,stop", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,step", "efl.dragable.vbar",
+ (obj, "drag,step", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,page", "efl.dragable.vbar",
+ (obj, "drag,page", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
(obj, "efl,vertical_bar,press", "efl",
@@ -1664,22 +1664,22 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
(obj, "efl,vbar,unpress", "efl",
obj, _efl_ui_image_zoomable_vbar_unpress_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag", "efl.dragable.hbar",
+ (obj, "drag", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,set", "efl.dragable.hbar",
+ (obj, "drag,set", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,start", "efl.dragable.hbar",
+ (obj, "drag,start", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,stop", "efl.dragable.hbar",
+ (obj, "drag,stop", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,step", "efl.dragable.hbar",
+ (obj, "drag,step", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,page", "efl.dragable.hbar",
+ (obj, "drag,page", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
(obj, "efl,horizontal_bar,press", "efl",
@@ -1751,22 +1751,22 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object
*obj)
efl_layout_signal_callback_del
(obj, "reload", "efl", obj, _efl_ui_image_zoomable_reload_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag", "efl.dragable.vbar",
+ (obj, "drag", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,set", "efl.dragable.vbar",
+ (obj, "drag,set", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,start", "efl.dragable.vbar",
+ (obj, "drag,start", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,stop", "efl.dragable.vbar",
+ (obj, "drag,stop", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,step", "efl.dragable.vbar",
+ (obj, "drag,step", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,page", "efl.dragable.vbar",
+ (obj, "drag,page", "efl.dragable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
(obj, "efl,vertical_bar,press", "efl",
@@ -1775,22 +1775,22 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object
*obj)
(obj, "efl,vbar,unpress", "efl",
obj, _efl_ui_image_zoomable_vbar_unpress_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag", "efl.dragable.hbar",
+ (obj, "drag", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,set", "efl.dragable.hbar",
+ (obj, "drag,set", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,start", "efl.dragable.hbar",
+ (obj, "drag,start", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,stop", "efl.dragable.hbar",
+ (obj, "drag,stop", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,step", "efl.dragable.hbar",
+ (obj, "drag,step", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,page", "efl.dragable.hbar",
+ (obj, "drag,page", "efl.dragable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
(obj, "efl,horizontal_bar,press", "efl",
diff --git a/src/lib/elementary/efl_ui_scroll_util.c
b/src/lib/elementary/efl_ui_scroll_util.c
index dec7e5dd28..9f6d2eec05 100644
--- a/src/lib/elementary/efl_ui_scroll_util.c
+++ b/src/lib/elementary/efl_ui_scroll_util.c
@@ -23,10 +23,10 @@
_scroll_connector_bar_read_and_update(Scroll_Connector_Context *ctx)
double vx = 0.0, vy = 0.0;
edje_object_part_drag_value_get
- (wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
+ (wd->resize_obj, "efl.dragable.vertical_bar", NULL, &vy);
edje_object_part_drag_value_get
- (wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
+ (wd->resize_obj, "efl.dragable.horizontal_bar", &vx, NULL);
efl_ui_scrollbar_bar_position_set(ctx->smanager, vx, vy);
}
@@ -185,8 +185,8 @@ _scroll_connector_bar_size_changed_cb(void *data, const
Efl_Event *event EINA_UN
edje_object_calc_force(wd->resize_obj);
efl_ui_scrollbar_bar_size_get(ctx->smanager, &width, &height);
- edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width,
1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0,
height);
+ edje_object_part_drag_size_set(wd->resize_obj,
"efl.dragable.horizontal_bar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vertical_bar",
1.0, height);
}
static void
@@ -202,14 +202,14 @@ _scroll_connector_bar_pos_changed_cb(void *data, const
Efl_Event *event EINA_UNU
step = efl_ui_scrollable_step_size_get(ctx->smanager);
cs = efl_ui_scrollable_content_size_get(ctx->smanager);
- edje_object_part_drag_step_set(wd->resize_obj, "efl.dragable.hbar",
+ edje_object_part_drag_step_set(wd->resize_obj,
"efl.dragable.horizontal_bar",
(double)step.x / cs.w, 0.0);
- edje_object_part_drag_step_set(wd->resize_obj, "efl.dragable.vbar",
+ edje_object_part_drag_step_set(wd->resize_obj, "efl.dragable.vertical_bar",
0.0, (double)step.y / cs.h);
efl_ui_scrollbar_bar_position_get(ctx->smanager, &posx, &posy);
- edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx,
0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0,
posy);
+ edje_object_part_drag_value_set(wd->resize_obj,
"efl.dragable.horizontal_bar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj,
"efl.dragable.vertical_bar", 0.0, posy);
if (ctx->scroll_count)
ctx->need_scroll = EINA_TRUE;
else
@@ -257,33 +257,33 @@ efl_ui_scroll_connector_bind(Eo *obj, Eo *manager)
//from the theme to the object
efl_layout_signal_callback_add(obj, "reload", "efl",
ctx, _scroll_connector_reload_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag", "efl.dragable.vbar",
+ efl_layout_signal_callback_add(obj, "drag", "efl.dragable.vertical_bar",
ctx, _scroll_connector_vbar_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.vbar",
+ efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,start", "efl.dragable.vbar",
+ efl_layout_signal_callback_add(obj, "drag,start",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_start_cb,
NULL);
- efl_layout_signal_callback_add(obj, "drag,stop", "efl.dragable.vbar",
+ efl_layout_signal_callback_add(obj, "drag,stop",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_stop_cb,
NULL);
- efl_layout_signal_callback_add(obj, "drag,step", "efl.dragable.vbar",
+ efl_layout_signal_callback_add(obj, "drag,step",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.vbar",
+ efl_layout_signal_callback_add(obj, "drag,page",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
efl_layout_signal_callback_add(obj, "efl,vertical_bar,press", "efl",
ctx, _scroll_connector_vbar_press_cb, NULL);
efl_layout_signal_callback_add(obj, "efl,vbar,unpress", "efl",
ctx, _scroll_connector_vbar_unpress_cb,
NULL);
- efl_layout_signal_callback_add(obj, "drag", "efl.dragable.hbar",
+ efl_layout_signal_callback_add(obj, "drag", "efl.dragable.horizontal_bar",
ctx, _scroll_connector_hbar_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.hbar",
+ efl_layout_signal_callback_add(obj, "drag,set",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,start", "efl.dragable.hbar",
+ efl_layout_signal_callback_add(obj, "drag,start",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_start_cb,
NULL);
- efl_layout_signal_callback_add(obj, "drag,stop", "efl.dragable.hbar",
+ efl_layout_signal_callback_add(obj, "drag,stop",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_stop_cb,
NULL);
- efl_layout_signal_callback_add(obj, "drag,step", "efl.dragable.hbar",
+ efl_layout_signal_callback_add(obj, "drag,step",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.hbar",
+ efl_layout_signal_callback_add(obj, "drag,page",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
efl_layout_signal_callback_add(obj, "efl,horizontal_bar,press", "efl",
ctx, _scroll_connector_hbar_press_cb, NULL);
@@ -313,34 +313,34 @@ efl_ui_scroll_connector_unbind(Eo *obj)
efl_layout_signal_callback_del(obj, "reload", "efl",
ctx, _scroll_connector_reload_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag", "efl.dragable.vbar",
+ efl_layout_signal_callback_del(obj, "drag", "efl.dragable.vertical_bar",
ctx, _scroll_connector_vbar_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.vbar",
+ efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,start", "efl.dragable.vbar",
+ efl_layout_signal_callback_del(obj, "drag,start",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_start_cb,
NULL);
- efl_layout_signal_callback_del(obj, "drag,stop", "efl.dragable.vbar",
+ efl_layout_signal_callback_del(obj, "drag,stop",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_stop_cb,
NULL);
- efl_layout_signal_callback_del(obj, "drag,step", "efl.dragable.vbar",
+ efl_layout_signal_callback_del(obj, "drag,step",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.vbar",
+ efl_layout_signal_callback_del(obj, "drag,page",
"efl.dragable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
efl_layout_signal_callback_del(obj, "efl,vertical_bar,press", "efl",
ctx, _scroll_connector_vbar_press_cb, NULL);
efl_layout_signal_callback_del(obj, "efl,vbar,unpress", "efl",
ctx, _scroll_connector_vbar_unpress_cb,
NULL);
- efl_layout_signal_callback_del(obj, "drag", "efl.dragable.hbar",
+ efl_layout_signal_callback_del(obj, "drag", "efl.dragable.horizontal_bar",
ctx, _scroll_connector_hbar_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.hbar",
+ efl_layout_signal_callback_del(obj, "drag,set",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,start", "efl.dragable.hbar",
+ efl_layout_signal_callback_del(obj, "drag,start",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_start_cb,
NULL);
- efl_layout_signal_callback_del(obj, "drag,stop", "efl.dragable.hbar",
+ efl_layout_signal_callback_del(obj, "drag,stop",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_stop_cb,
NULL);
- efl_layout_signal_callback_del(obj, "drag,step", "efl.dragable.hbar",
+ efl_layout_signal_callback_del(obj, "drag,step",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.hbar",
+ efl_layout_signal_callback_del(obj, "drag,page",
"efl.dragable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
efl_layout_signal_callback_del(obj, "efl,horizontal_bar,press", "efl",
ctx, _scroll_connector_hbar_press_cb, NULL);
diff --git a/src/lib/elementary/elm_interface_scrollable.c
b/src/lib/elementary/elm_interface_scrollable.c
index c6a804d23d..0dca39db47 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -77,8 +77,8 @@ static void _elm_scroll_momentum_animator(void *data, const
Efl_Event *event);
static const char iface_scr_legacy_dragable_hbar[] = "elm.dragable.hbar";
static const char iface_scr_legacy_dragable_vbar[] = "elm.dragable.vbar";
-static const char iface_scr_efl_ui_dragable_hbar[] = "efl.dragable.hbar";
-static const char iface_scr_efl_ui_dragable_vbar[] = "efl.dragable.vbar";
+static const char iface_scr_efl_ui_dragable_hbar[] =
"efl.dragable.horizontal_bar";
+static const char iface_scr_efl_ui_dragable_vbar[] =
"efl.dragable.vertical_bar";
static double
_round(double value, int pos)
--
