summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-09-27 08:42:27 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-09-27 08:42:27 -0400
commit18ea5fd118dd0f1c6503eb3e57fb7bd0184c3572 (patch)
treeafebd26f68efe6a88eb8ef4ec576540bec1f37b8
parentb5a917c12005302520ab3d9a93661ad003e3dcaf (diff)
downloadefl-18ea5fd118dd0f1c6503eb3e57fb7bd0184c3572.tar.gz
themes: Rename "dragable" to "draggable"
Summary: "Dragable" is a misspelling: https://en.wiktionary.org/wiki/dragable We have it EVERYWHERE in EFL, even with jokes: ./src/lib/efl/interfaces/efl_ui_drag.eo:1 This patch only fixes the theme API so it does not get carved in stone for this release. Depends on D10217 Test Plan: No functional changes. Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10218
-rw-r--r--data/elementary/themes/edc/efl/collection.edc4
-rw-r--r--data/elementary/themes/edc/efl/grid.edc8
-rw-r--r--data/elementary/themes/edc/efl/image_zoomable.edc4
-rw-r--r--data/elementary/themes/edc/efl/list.edc8
-rw-r--r--data/elementary/themes/edc/efl/scroller.edc96
-rw-r--r--data/elementary/themes/edc/efl/slider.edc120
-rw-r--r--data/elementary/themes/edc/efl/text.edc4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c60
-rw-r--r--src/lib/elementary/efl_ui_scroll_util.c64
-rw-r--r--src/lib/elementary/efl_ui_slider.c12
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.c28
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c4
12 files changed, 206 insertions, 206 deletions
diff --git a/data/elementary/themes/edc/efl/collection.edc b/data/elementary/themes/edc/efl/collection.edc
index d2e4ba6dba..ab56e8be7e 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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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 a57a120038..51c1bd941d 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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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 6b3e905f63..535cbbde6b 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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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 e96ee028a1..71da7877f2 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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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 a0bb08836a..688a1aec49 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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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.horizontal_bar (required)
- Part Rectangle: efl.dragable.vertical_bar (required)
+ Part Rectangle: efl.draggable.horizontal_bar (required)
+ Part Rectangle: efl.draggable.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.vertical_bar";
+ rel2.to: "efl.draggable.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.vertical_bar";
+ rel1.to: "efl.draggable.vertical_bar";
rel2.relative: 1.0 0.0;
rel2.to: "sb_vbar_a2";
fixed: 1 1;
}
}
- part { name: "efl.dragable.vertical_bar"; type: RECT; required;
+ part { name: "efl.draggable.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.vertical_bar";
- rel2.to: "efl.dragable.vertical_bar";
+ rel1.to: "efl.draggable.vertical_bar";
+ rel2.to: "efl.draggable.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.vertical_bar";
- rel2.to: "efl.dragable.vertical_bar";
+ rel1.to: "efl.draggable.vertical_bar";
+ rel2.to: "efl.draggable.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.vertical_bar";
+ target: "efl.draggable.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.vertical_bar";
+ target: "efl.draggable.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.vertical_bar";
+ target: "efl.draggable.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.vertical_bar";
+ target: "efl.draggable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0;
- target: "efl.dragable.vertical_bar";
+ target: "efl.draggable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0;
- target: "efl.dragable.vertical_bar";
+ target: "efl.draggable.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.horizontal_bar";
+ rel2.to: "efl.draggable.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.horizontal_bar";
+ rel1.to: "efl.draggable.horizontal_bar";
rel2.relative: 0.0 1.0;
rel2.to: "sb_hbar_a2";
fixed: 1 1;
}
}
- part { name: "efl.dragable.horizontal_bar"; type: RECT; required;
+ part { name: "efl.draggable.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.horizontal_bar";
- rel2.to: "efl.dragable.horizontal_bar";
+ rel1.to: "efl.draggable.horizontal_bar";
+ rel2.to: "efl.draggable.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.horizontal_bar";
- rel2.to: "efl.dragable.horizontal_bar";
+ rel1.to: "efl.draggable.horizontal_bar";
+ rel2.to: "efl.draggable.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.horizontal_bar";
+ target: "efl.draggable.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.horizontal_bar";
+ target: "efl.draggable.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.horizontal_bar";
+ target: "efl.draggable.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.horizontal_bar";
+ target: "efl.draggable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0;
- target: "efl.dragable.horizontal_bar";
+ target: "efl.draggable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0;
- target: "efl.dragable.horizontal_bar";
+ target: "efl.draggable.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.vertical_bar";
+ rel1.to: "efl.draggable.vertical_bar";
rel2.offset: -3 -1;
- rel2.to: "efl.dragable.vertical_bar";
+ rel2.to: "efl.draggable.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.horizontal_bar";
+ rel1.to: "efl.draggable.horizontal_bar";
rel2.offset: -1 -3;
- rel2.to: "efl.dragable.horizontal_bar";
+ rel2.to: "efl.draggable.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.vertical_bar";
+ signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
action: STATE_SET "clicked" 0.0;
- target: "efl.dragable.vertical_bar";
+ target: "efl.draggable.vertical_bar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
- signal: "mouse,down,*"; source: "efl.dragable.vertical_bar";
+ signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.vertical_bar";
+ signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
action: STATE_SET "default" 0.0;
- target: "efl.dragable.vertical_bar";
+ target: "efl.draggable.vertical_bar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
- signal: "mouse,up,*"; source: "efl.dragable.vertical_bar";
+ signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
action: SIGNAL_EMIT "efl,vbar,unpress" "efl";
}
program {
- signal: "mouse,down,1*"; source: "efl.dragable.horizontal_bar";
+ signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
action: STATE_SET "clicked" 0.0;
- target: "efl.dragable.horizontal_bar";
+ target: "efl.draggable.horizontal_bar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
- signal: "mouse,down,*"; source: "efl.dragable.horizontal_bar";
+ signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.horizontal_bar";
+ signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
action: STATE_SET "default" 0.0;
- target: "efl.dragable.horizontal_bar";
+ target: "efl.draggable.horizontal_bar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
- signal: "mouse,up,*"; source: "efl.dragable.horizontal_bar";
+ signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
}
}
diff --git a/data/elementary/themes/edc/efl/slider.edc b/data/elementary/themes/edc/efl/slider.edc
index 369ef2dadd..3df5e27b4d 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -1,13 +1,13 @@
/**
Group: efl/slider/horizontal (@since 1.23)
- Part Rectangle: efl.dragable.slider
+ Part Rectangle: efl.draggable.slider
Part Swallow: efl.bar
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,inverted,off
Signal: efl,state,inverted,on
Group: efl/slider/vertical (@since 1.23)
- Part Rectangle: efl.dragable.slider
+ Part Rectangle: efl.draggable.slider
Part Swallow: efl.bar
Signal: efl,state,disabled
Signal: efl,state,enabled
@@ -105,7 +105,7 @@ group { "efl/slider/horizontal";
rel1.to: "base";
rel2.relative: 0.5 1.0;
rel2.offset: -1 -2;
- rel2.to_x: "efl.dragable.slider";
+ rel2.to_x: "efl.draggable.slider";
rel2.to_y: "base";
image.border: 0 4 0 0;
}
@@ -117,7 +117,7 @@ group { "efl/slider/horizontal";
image.normal: "horiz_glow_run_rev.png";
rel1.relative: 0.5 0.0;
rel1.offset: 0 1;
- rel1.to_x: "efl.dragable.slider";
+ rel1.to_x: "efl.draggable.slider";
rel1.to_y: "base";
rel2.offset: -2 -2;
rel2.to: "base";
@@ -137,7 +137,7 @@ group { "efl/slider/horizontal";
fill.smooth: 0;
}
}
- part { name: "efl.dragable.slider"; type: RECT;
+ part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 1 1 0;
@@ -162,9 +162,9 @@ group { "efl/slider/horizontal";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
- rel2.to: "efl.dragable.slider";
+ rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@@ -175,11 +175,11 @@ group { "efl/slider/horizontal";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
- dragable.events: "efl.dragable.slider";
+ dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "efl.dragable.slider";
- rel2.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
+ rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
@@ -196,12 +196,12 @@ group { "efl/slider/horizontal";
}
programs {
program {
- signal: "mouse,down,1"; source: "efl.dragable.slider";
+ signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.slider";
+ signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
@@ -332,7 +332,7 @@ group { "efl/slider/vertical";
image.normal: "vert_glow_run.png";
rel1.relative: 0.0 0.5;
rel1.offset: 1 0;
- rel1.to_y: "efl.dragable.slider";
+ rel1.to_y: "efl.draggable.slider";
rel1.to_x: "base";
rel2.offset: -2 -2;
rel2.to: "base";
@@ -348,7 +348,7 @@ group { "efl/slider/vertical";
rel1.to: "base";
rel2.relative: 1.0 0.5;
rel2.offset: -2 -1;
- rel2.to_y: "efl.dragable.slider";
+ rel2.to_y: "efl.draggable.slider";
rel2.to_x: "base";
image.border: 0 0 0 4;
}
@@ -366,7 +366,7 @@ group { "efl/slider/vertical";
fill.smooth: 0;
}
}
- part { name: "efl.dragable.slider"; type: RECT;
+ part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 0 0 0;
@@ -391,9 +391,9 @@ group { "efl/slider/vertical";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
- rel2.to: "efl.dragable.slider";
+ rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@@ -404,11 +404,11 @@ group { "efl/slider/vertical";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
- dragable.events: "efl.dragable.slider";
+ dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "efl.dragable.slider";
- rel2.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
+ rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
@@ -425,12 +425,12 @@ group { "efl/slider/vertical";
}
programs {
program {
- signal: "mouse,down,1"; source: "efl.dragable.slider";
+ signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.slider";
+ signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
@@ -568,11 +568,11 @@ group { "efl/slider_interval/horizontal";
image.normal: "horiz_glow_range.png";
rel1.relative: 0.5 1.0;
rel1.offset: -1 -2;
- rel1.to_x: "efl.dragable.slider";
+ rel1.to_x: "efl.draggable.slider";
rel1.to_y: "base";
rel2.relative: 0.5 1.0;
rel2.offset: -1 -2;
- rel2.to_x: "efl.dragable2.slider";
+ rel2.to_x: "efl.draggable2.slider";
rel2.to_y: "base";
fixed: 0 1;
image.border: 0 4 0 0;
@@ -583,8 +583,8 @@ group { "efl/slider_interval/horizontal";
}
description { state: "range_reverse" 0.0;
inherit: "default" 0.0;
- rel1.to_x: "efl.dragable2.slider";
- rel2.to_x: "efl.dragable.slider";
+ rel1.to_x: "efl.draggable2.slider";
+ rel2.to_x: "efl.draggable.slider";
}
description { state: "disabled_range_reverse" 0.0;
inherit: "range_reverse" 0.0;
@@ -600,7 +600,7 @@ group { "efl/slider_interval/horizontal";
fill.smooth: 0;
}
}
- part { name: "efl.dragable.slider"; type: RECT;
+ part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 1 1 0;
@@ -625,9 +625,9 @@ group { "efl/slider_interval/horizontal";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
- rel2.to: "efl.dragable.slider";
+ rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@@ -638,15 +638,15 @@ group { "efl/slider_interval/horizontal";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
- dragable.events: "efl.dragable.slider";
+ dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "efl.dragable.slider";
- rel2.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
+ rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
- part { name: "efl.dragable2.slider"; type: RECT;
+ part { name: "efl.draggable2.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 1 1 0;
@@ -671,9 +671,9 @@ group { "efl/slider_interval/horizontal";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.dragable2.slider";
+ rel1.to: "efl.draggable2.slider";
rel1.offset: -4 -4;
- rel2.to: "efl.dragable2.slider";
+ rel2.to: "efl.draggable2.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@@ -684,11 +684,11 @@ group { "efl/slider_interval/horizontal";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
- dragable.events: "efl.dragable2.slider";
+ dragable.events: "efl.draggable2.slider";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "efl.dragable2.slider";
- rel2.to: "efl.dragable2.slider";
+ rel1.to: "efl.draggable2.slider";
+ rel2.to: "efl.draggable2.slider";
color: 0 0 0 0;
}
}
@@ -705,18 +705,18 @@ group { "efl/slider_interval/horizontal";
}
programs {
program {
- signal: "mouse,down,1"; source: "efl.dragable.slider";
+ signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.slider";
+ signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
program {
signal: "drag";
- source: "efl.dragable*";
+ source: "efl.draggable*";
script {
update_glow();
}
@@ -837,11 +837,11 @@ group { "efl/slider_interval/vertical";
rel1.relative: 0.5 1.0;
rel1.offset: -1 -2;
rel1.to_x: "base";
- rel1.to_y: "efl.dragable.slider";
+ rel1.to_y: "efl.draggable.slider";
rel2.relative: 0.5 1.0;
rel2.offset: -1 -2;
rel2.to_x: "base";
- rel2.to_y: "efl.dragable2.slider";
+ rel2.to_y: "efl.draggable2.slider";
fixed: 1 0;
image.border: 0 4 0 0;
}
@@ -851,8 +851,8 @@ group { "efl/slider_interval/vertical";
}
description { state: "range_reverse" 0.0;
inherit: "default" 0.0;
- rel1.to_y: "efl.dragable2.slider";
- rel2.to_y: "efl.dragable.slider";
+ rel1.to_y: "efl.draggable2.slider";
+ rel2.to_y: "efl.draggable.slider";
}
description { state: "disabled_range_reverse" 0.0;
inherit: "range_reverse" 0.0;
@@ -868,7 +868,7 @@ group { "efl/slider_interval/vertical";
fill.smooth: 0;
}
}
- part { name: "efl.dragable.slider"; type: RECT;
+ part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 0 0 0;
@@ -893,9 +893,9 @@ group { "efl/slider_interval/vertical";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
- rel2.to: "efl.dragable.slider";
+ rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@@ -906,15 +906,15 @@ group { "efl/slider_interval/vertical";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
- dragable.events: "efl.dragable.slider";
+ dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "efl.dragable.slider";
- rel2.to: "efl.dragable.slider";
+ rel1.to: "efl.draggable.slider";
+ rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
- part { name: "efl.dragable2.slider"; type: RECT;
+ part { name: "efl.draggable2.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 0 0 0;
@@ -939,9 +939,9 @@ group { "efl/slider_interval/vertical";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.dragable2.slider";
+ rel1.to: "efl.draggable2.slider";
rel1.offset: -4 -4;
- rel2.to: "efl.dragable2.slider";
+ rel2.to: "efl.draggable2.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@@ -952,11 +952,11 @@ group { "efl/slider_interval/vertical";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
- dragable.events: "efl.dragable2.slider";
+ dragable.events: "efl.draggable2.slider";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "efl.dragable2.slider";
- rel2.to: "efl.dragable2.slider";
+ rel1.to: "efl.draggable2.slider";
+ rel2.to: "efl.draggable2.slider";
color: 0 0 0 0;
}
}
@@ -973,18 +973,18 @@ group { "efl/slider_interval/vertical";
}
programs {
program {
- signal: "mouse,down,1"; source: "efl.dragable.slider";
+ signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
- signal: "mouse,up,1"; source: "efl.dragable.slider";
+ signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
program {
signal: "drag";
- source: "efl.dragable*";
+ source: "efl.draggable*";
script {
update_glow();
}
diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc
index 8f4a1df939..b698d7b8fe 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.vertical_bar"; type: RECT;
+ part { name: "efl.draggable.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.horizontal_bar"; type: RECT;
+ part { name: "efl.draggable.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 5d22591569..19d2e0155b 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.vertical_bar", NULL, &vy);
+ (wd->resize_obj, "efl.draggable.vertical_bar", NULL, &vy);
edje_object_part_drag_value_get
- (wd->resize_obj, "efl.dragable.horizontal_bar", &vx, NULL);
+ (wd->resize_obj, "efl.draggable.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.horizontal_bar", width, 1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vertical_bar", 1.0, height);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.horizontal_bar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.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.horizontal_bar", posx, 0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vertical_bar", 0.0, posy);
+ edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.horizontal_bar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.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.vertical_bar",
+ (obj, "drag", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,set", "efl.dragable.vertical_bar",
+ (obj, "drag,set", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,start", "efl.dragable.vertical_bar",
+ (obj, "drag,start", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,stop", "efl.dragable.vertical_bar",
+ (obj, "drag,stop", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,step", "efl.dragable.vertical_bar",
+ (obj, "drag,step", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,page", "efl.dragable.vertical_bar",
+ (obj, "drag,page", "efl.draggable.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.horizontal_bar",
+ (obj, "drag", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,set", "efl.dragable.horizontal_bar",
+ (obj, "drag,set", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,start", "efl.dragable.horizontal_bar",
+ (obj, "drag,start", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,stop", "efl.dragable.horizontal_bar",
+ (obj, "drag,stop", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,step", "efl.dragable.horizontal_bar",
+ (obj, "drag,step", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_add
- (obj, "drag,page", "efl.dragable.horizontal_bar",
+ (obj, "drag,page", "efl.draggable.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.vertical_bar",
+ (obj, "drag", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,set", "efl.dragable.vertical_bar",
+ (obj, "drag,set", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,start", "efl.dragable.vertical_bar",
+ (obj, "drag,start", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,stop", "efl.dragable.vertical_bar",
+ (obj, "drag,stop", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,step", "efl.dragable.vertical_bar",
+ (obj, "drag,step", "efl.draggable.vertical_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,page", "efl.dragable.vertical_bar",
+ (obj, "drag,page", "efl.draggable.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.horizontal_bar",
+ (obj, "drag", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,set", "efl.dragable.horizontal_bar",
+ (obj, "drag,set", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,start", "efl.dragable.horizontal_bar",
+ (obj, "drag,start", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,stop", "efl.dragable.horizontal_bar",
+ (obj, "drag,stop", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,step", "efl.dragable.horizontal_bar",
+ (obj, "drag,step", "efl.draggable.horizontal_bar",
obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
efl_layout_signal_callback_del
- (obj, "drag,page", "efl.dragable.horizontal_bar",
+ (obj, "drag,page", "efl.draggable.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 9f6d2eec05..673cac2eae 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.vertical_bar", NULL, &vy);
+ (wd->resize_obj, "efl.draggable.vertical_bar", NULL, &vy);
edje_object_part_drag_value_get
- (wd->resize_obj, "efl.dragable.horizontal_bar", &vx, NULL);
+ (wd->resize_obj, "efl.draggable.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.horizontal_bar", width, 1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vertical_bar", 1.0, height);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.horizontal_bar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.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.horizontal_bar",
+ edje_object_part_drag_step_set(wd->resize_obj, "efl.draggable.horizontal_bar",
(double)step.x / cs.w, 0.0);
- edje_object_part_drag_step_set(wd->resize_obj, "efl.dragable.vertical_bar",
+ edje_object_part_drag_step_set(wd->resize_obj, "efl.draggable.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.horizontal_bar", posx, 0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vertical_bar", 0.0, posy);
+ edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.horizontal_bar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.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.vertical_bar",
+ efl_layout_signal_callback_add(obj, "drag", "efl.draggable.vertical_bar",
ctx, _scroll_connector_vbar_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_add(obj, "drag,set", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,start", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_add(obj, "drag,start", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_start_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,stop", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_add(obj, "drag,stop", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_stop_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,step", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_add(obj, "drag,step", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_add(obj, "drag,page", "efl.draggable.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.horizontal_bar",
+ efl_layout_signal_callback_add(obj, "drag", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_hbar_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_add(obj, "drag,set", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,start", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_add(obj, "drag,start", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_start_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,stop", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_add(obj, "drag,stop", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_stop_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,step", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_add(obj, "drag,step", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_add(obj, "drag,page", "efl.draggable.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.vertical_bar",
+ efl_layout_signal_callback_del(obj, "drag", "efl.draggable.vertical_bar",
ctx, _scroll_connector_vbar_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_del(obj, "drag,set", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,start", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_del(obj, "drag,start", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_start_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,stop", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_del(obj, "drag,stop", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_stop_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,step", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_del(obj, "drag,step", "efl.draggable.vertical_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.vertical_bar",
+ efl_layout_signal_callback_del(obj, "drag,page", "efl.draggable.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.horizontal_bar",
+ efl_layout_signal_callback_del(obj, "drag", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_hbar_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_del(obj, "drag,set", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,start", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_del(obj, "drag,start", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_start_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,stop", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_del(obj, "drag,stop", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_stop_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,step", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_del(obj, "drag,step", "efl.draggable.horizontal_bar",
ctx, _scroll_connector_edje_drag_cb, NULL);
- efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.horizontal_bar",
+ efl_layout_signal_callback_del(obj, "drag,page", "efl.draggable.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/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 00a66d3804..2aca5f96f5 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -85,7 +85,7 @@ _drag_value_fetch(Evas_Object *obj)
double posx = 0.0, posy = 0.0, pos = 0.0, val;
- efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable.slider"),
&posx, &posy);
if (_is_horizontal(sd->dir)) pos = posx;
else pos = posy;
@@ -129,7 +129,7 @@ _drag_value_update(Evas_Object *obj)
pos = 1.0 - pos;
}
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
pos, pos);
evas_object_smart_changed(obj);
@@ -192,7 +192,7 @@ _drag_up(Evas_Object *obj)
relative_step = step/(sd->val_max - sd->val_min);
- efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
relative_step, relative_step);
_drag_value_fetch(obj);
}
@@ -212,7 +212,7 @@ _drag_down(Evas_Object *obj)
relative_step = step/(sd->val_max - sd->val_min);
- efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
relative_step, relative_step);
_drag_value_fetch(obj);
}
@@ -445,7 +445,7 @@ _spacer_down_cb(void *data,
if (button_y < 0) button_y = 0;
}
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
button_x, button_y);
if (!efl_ui_focus_object_focus_get(data))
@@ -511,7 +511,7 @@ _spacer_move_cb(void *data,
if (button_y < 0) button_y = 0;
}
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
button_x, button_y);
_drag_value_fetch(data);
}
diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c
index 63611226d3..e5fe1f5243 100644
--- a/src/lib/elementary/efl_ui_slider_interval.c
+++ b/src/lib/elementary/efl_ui_slider_interval.c
@@ -82,9 +82,9 @@ _val_set(Evas_Object *obj)
else if (pos2 > 1.0)
pos2 = 1.0;
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
pos, pos);
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
pos2, pos2);
// emit accessibility event also if value was changed by API
@@ -103,12 +103,12 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
EFL_UI_SLIDER_INTERVAL_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable.slider"),
&posx, &posy);
if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos = posx;
else pos = posy;
- efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"),
+ efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable2.slider"),
&posx2, &posy2);
if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2;
else pos2 = posy2;
@@ -163,9 +163,9 @@ _down_knob(Evas_Object *obj, double button_x, double button_y)
sd->intvl_flag = 0;
- efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable.slider"),
&posx, &posy);
- efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"),
+ efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable2.slider"),
&posx2, &posy2);
if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
@@ -183,13 +183,13 @@ _down_knob(Evas_Object *obj, double button_x, double button_y)
if (diff1 < diff2)
{
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
button_x, button_y);
sd->intvl_flag = 1;
}
else if (diff1 > diff2)
{
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
button_x, button_y);
sd->intvl_flag = 2;
}
@@ -197,13 +197,13 @@ _down_knob(Evas_Object *obj, double button_x, double button_y)
{
if (diff3 < 0)
{
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
button_x, button_y);
sd->intvl_flag = 1;
}
else
{
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
button_x, button_y);
sd->intvl_flag = 2;
}
@@ -218,12 +218,12 @@ _move_knob(Evas_Object *obj, double button_x, double button_y)
if (sd->intvl_flag == 1)
{
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
button_x, button_y);
}
else if (sd->intvl_flag == 2)
{
- efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
button_x, button_y);
}
}
@@ -640,7 +640,7 @@ _drag_up(Evas_Object *obj)
relative_step = step/(sd->val_max - sd->val_min);
- efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
relative_step, relative_step);
_slider_update(obj, EINA_TRUE);
}
@@ -659,7 +659,7 @@ _drag_down(Evas_Object *obj)
relative_step = step/(sd->val_max - sd->val_min);
- efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"),
+ efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
relative_step, relative_step);
_slider_update(obj, EINA_TRUE);
}
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 0dca39db47..4defc707b4 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.horizontal_bar";
-static const char iface_scr_efl_ui_dragable_vbar[] = "efl.dragable.vertical_bar";
+static const char iface_scr_efl_ui_dragable_hbar[] = "efl.draggable.horizontal_bar";
+static const char iface_scr_efl_ui_dragable_vbar[] = "efl.draggable.vertical_bar";
static double
_round(double value, int pos)