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)
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 @@
1/** 1/**
2Group: efl/collection (@since 1.23) 2Group: efl/collection (@since 1.23)
3 Part Rectangle: efl.dragable.horizontal_bar (required) 3 Part Rectangle: efl.draggable.horizontal_bar (required)
4 Part Rectangle: efl.dragable.vertical_bar (required) 4 Part Rectangle: efl.draggable.vertical_bar (required)
5 Part Swallow: efl.background (required) 5 Part Swallow: efl.background (required)
6 Part Swallow: efl.content (required) 6 Part Swallow: efl.content (required)
7 Part Swallow: efl.overlay (required) 7 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 @@
1/** 1/**
2Group: efl/grid (@since 1.23) 2Group: efl/grid (@since 1.23)
3 Part Rectangle: efl.dragable.horizontal_bar (required) 3 Part Rectangle: efl.draggable.horizontal_bar (required)
4 Part Rectangle: efl.dragable.vertical_bar (required) 4 Part Rectangle: efl.draggable.vertical_bar (required)
5 Part Swallow: efl.background (required) 5 Part Swallow: efl.background (required)
6 Part Swallow: efl.content (required) 6 Part Swallow: efl.content (required)
7 Part Swallow: efl.overlay (required) 7 Part Swallow: efl.overlay (required)
@@ -19,8 +19,8 @@ Group: efl/grid_item (@since 1.23)
19 Signal: efl,state,selected 19 Signal: efl,state,selected
20 Signal: efl,state,unselected 20 Signal: efl,state,unselected
21Group: efl/view_grid (@since 1.23) 21Group: efl/view_grid (@since 1.23)
22 Part Rectangle: efl.dragable.horizontal_bar (required) 22 Part Rectangle: efl.draggable.horizontal_bar (required)
23 Part Rectangle: efl.dragable.vertical_bar (required) 23 Part Rectangle: efl.draggable.vertical_bar (required)
24 Part Swallow: efl.background (required) 24 Part Swallow: efl.background (required)
25 Part Swallow: efl.content (required) 25 Part Swallow: efl.content (required)
26 Part Swallow: efl.overlay (required) 26 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 @@
1/** 1/**
2Group: efl/image_zoomable (@since 1.23) 2Group: efl/image_zoomable (@since 1.23)
3 Part Rectangle: efl.dragable.horizontal_bar (required) 3 Part Rectangle: efl.draggable.horizontal_bar (required)
4 Part Rectangle: efl.dragable.vertical_bar (required) 4 Part Rectangle: efl.draggable.vertical_bar (required)
5 Part Swallow: efl.background (required) 5 Part Swallow: efl.background (required)
6 Part Swallow: efl.content (required) 6 Part Swallow: efl.content (required)
7 Part Swallow: efl.overlay (required) 7 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 @@
1/** 1/**
2Group: efl/list (@since 1.23) 2Group: efl/list (@since 1.23)
3 Part Rectangle: efl.dragable.horizontal_bar (required) 3 Part Rectangle: efl.draggable.horizontal_bar (required)
4 Part Rectangle: efl.dragable.vertical_bar (required) 4 Part Rectangle: efl.draggable.vertical_bar (required)
5 Part Swallow: efl.background (required) 5 Part Swallow: efl.background (required)
6 Part Swallow: efl.content (required) 6 Part Swallow: efl.content (required)
7 Part Swallow: efl.overlay (required) 7 Part Swallow: efl.overlay (required)
@@ -35,8 +35,8 @@ Group: efl/list_item:placeholder (@since 1.23)
35 Signal: efl,state,unpressed 35 Signal: efl,state,unpressed
36 Signal: efl,state,unselected 36 Signal: efl,state,unselected
37Group: efl/list_view (@since 1.23) 37Group: efl/list_view (@since 1.23)
38 Part Rectangle: efl.dragable.horizontal_bar (required) 38 Part Rectangle: efl.draggable.horizontal_bar (required)
39 Part Rectangle: efl.dragable.vertical_bar (required) 39 Part Rectangle: efl.draggable.vertical_bar (required)
40 Part Swallow: efl.background (required) 40 Part Swallow: efl.background (required)
41 Part Swallow: efl.content (required) 41 Part Swallow: efl.content (required)
42 Part Swallow: efl.overlay (required) 42 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 @@
1/** 1/**
2Group: efl/scroller (@since 1.23) 2Group: efl/scroller (@since 1.23)
3 Part Rectangle: efl.dragable.horizontal_bar (required) 3 Part Rectangle: efl.draggable.horizontal_bar (required)
4 Part Rectangle: efl.dragable.vertical_bar (required) 4 Part Rectangle: efl.draggable.vertical_bar (required)
5 Part Swallow: efl.background (required) 5 Part Swallow: efl.background (required)
6 Part Swallow: efl.content (required) 6 Part Swallow: efl.content (required)
7 Part Swallow: efl.overlay (required) 7 Part Swallow: efl.overlay (required)
@@ -11,8 +11,8 @@ Group: efl/scroller (@since 1.23)
11 Signal: efl,vertical_bar,visible,off 11 Signal: efl,vertical_bar,visible,off
12 Signal: efl,vertical_bar,visible,on 12 Signal: efl,vertical_bar,visible,on
13Group: efl/scroller:noclip (@since 1.23) 13Group: efl/scroller:noclip (@since 1.23)
14 Part Rectangle: efl.dragable.horizontal_bar (required) 14 Part Rectangle: efl.draggable.horizontal_bar (required)
15 Part Rectangle: efl.dragable.vertical_bar (required) 15 Part Rectangle: efl.draggable.vertical_bar (required)
16 Part Swallow: efl.background (required) 16 Part Swallow: efl.background (required)
17 Part Swallow: efl.content (required) 17 Part Swallow: efl.content (required)
18 Part Swallow: efl.overlay (required) 18 Part Swallow: efl.overlay (required)
@@ -22,8 +22,8 @@ Group: efl/scroller:noclip (@since 1.23)
22 Signal: efl,vertical_bar,visible,off 22 Signal: efl,vertical_bar,visible,off
23 Signal: efl,vertical_bar,visible,on 23 Signal: efl,vertical_bar,visible,on
24Group: efl/scroller:popup/no_inset_shadow (@since 1.23) 24Group: efl/scroller:popup/no_inset_shadow (@since 1.23)
25 Part Rectangle: efl.dragable.horizontal_bar (required) 25 Part Rectangle: efl.draggable.horizontal_bar (required)
26 Part Rectangle: efl.dragable.vertical_bar (required) 26 Part Rectangle: efl.draggable.vertical_bar (required)
27 Part Swallow: efl.background (required) 27 Part Swallow: efl.background (required)
28 Part Swallow: efl.content (required) 28 Part Swallow: efl.content (required)
29 Part Swallow: efl.overlay (required) 29 Part Swallow: efl.overlay (required)
@@ -191,7 +191,7 @@ group { name: "efl/scroller";
191 rel1.relative: 0.0 1.0; 191 rel1.relative: 0.0 1.0;
192 rel1.to: "sb_vbar_a1"; 192 rel1.to: "sb_vbar_a1";
193 rel2.relative: 1.0 0.0; 193 rel2.relative: 1.0 0.0;
194 rel2.to: "efl.dragable.vertical_bar"; 194 rel2.to: "efl.draggable.vertical_bar";
195 fixed: 1 1; 195 fixed: 1 1;
196 } 196 }
197 } 197 }
@@ -200,13 +200,13 @@ group { name: "efl/scroller";
200 description { state: "default" 0.0; 200 description { state: "default" 0.0;
201 color: 0 0 0 0; 201 color: 0 0 0 0;
202 rel1.relative: 0.0 1.0; 202 rel1.relative: 0.0 1.0;
203 rel1.to: "efl.dragable.vertical_bar"; 203 rel1.to: "efl.draggable.vertical_bar";
204 rel2.relative: 1.0 0.0; 204 rel2.relative: 1.0 0.0;
205 rel2.to: "sb_vbar_a2"; 205 rel2.to: "sb_vbar_a2";
206 fixed: 1 1; 206 fixed: 1 1;
207 } 207 }
208 } 208 }
209 part { name: "efl.dragable.vertical_bar"; type: RECT; required; 209 part { name: "efl.draggable.vertical_bar"; type: RECT; required;
210 clip_to: "sb_vbar"; 210 clip_to: "sb_vbar";
211 scale: 1; 211 scale: 1;
212 dragable.x: 0 0 0; 212 dragable.x: 0 0 0;
@@ -254,8 +254,8 @@ group { name: "efl/scroller";
254 max: 4 2; 254 max: 4 2;
255 fixed: 1 1; 255 fixed: 1 1;
256 align: 0.0 0.0; 256 align: 0.0 0.0;
257 rel1.to: "efl.dragable.vertical_bar"; 257 rel1.to: "efl.draggable.vertical_bar";
258 rel2.to: "efl.dragable.vertical_bar"; 258 rel2.to: "efl.draggable.vertical_bar";
259 } 259 }
260 description { state: "hidden" 0.0; 260 description { state: "hidden" 0.0;
261 inherit: "default" 0.0; 261 inherit: "default" 0.0;
@@ -288,8 +288,8 @@ group { name: "efl/scroller";
288 max: 4 2; 288 max: 4 2;
289 fixed: 1 1; 289 fixed: 1 1;
290 align: 0.0 1.0; 290 align: 0.0 1.0;
291 rel1.to: "efl.dragable.vertical_bar"; 291 rel1.to: "efl.draggable.vertical_bar";
292 rel2.to: "efl.dragable.vertical_bar"; 292 rel2.to: "efl.draggable.vertical_bar";
293 } 293 }
294 description { state: "hidden" 0.0; 294 description { state: "hidden" 0.0;
295 inherit: "default" 0.0; 295 inherit: "default" 0.0;
@@ -340,7 +340,7 @@ group { name: "efl/scroller";
340 action: STATE_SET "default" 0.0; 340 action: STATE_SET "default" 0.0;
341 target: "sb_vbar"; 341 target: "sb_vbar";
342 target: "sb_vbar_show"; 342 target: "sb_vbar_show";
343 target: "efl.dragable.vertical_bar"; 343 target: "efl.draggable.vertical_bar";
344 target: "sb_vbar_a1"; 344 target: "sb_vbar_a1";
345 target: "sb_vbar_a2"; 345 target: "sb_vbar_a2";
346 target: "y_vbar_up_mapper"; 346 target: "y_vbar_up_mapper";
@@ -355,7 +355,7 @@ group { name: "efl/scroller";
355 action: STATE_SET "hidden" 0.0; 355 action: STATE_SET "hidden" 0.0;
356 target: "sb_vbar"; 356 target: "sb_vbar";
357 target: "sb_vbar_show"; 357 target: "sb_vbar_show";
358 target: "efl.dragable.vertical_bar"; 358 target: "efl.draggable.vertical_bar";
359 target: "sb_vbar_a1"; 359 target: "sb_vbar_a1";
360 target: "sb_vbar_a2"; 360 target: "sb_vbar_a2";
361 target: "y_vbar_up_mapper"; 361 target: "y_vbar_up_mapper";
@@ -379,7 +379,7 @@ group { name: "efl/scroller";
379 } 379 }
380 program { name: "drag_up"; 380 program { name: "drag_up";
381 action: DRAG_VAL_STEP 0.0 -1.0; 381 action: DRAG_VAL_STEP 0.0 -1.0;
382 target: "efl.dragable.vertical_bar"; 382 target: "efl.draggable.vertical_bar";
383 } 383 }
384 program { 384 program {
385 signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok 385 signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
@@ -395,17 +395,17 @@ group { name: "efl/scroller";
395 } 395 }
396 program { name: "drag_down"; 396 program { name: "drag_down";
397 action: DRAG_VAL_STEP 0.0 1.0; 397 action: DRAG_VAL_STEP 0.0 1.0;
398 target: "efl.dragable.vertical_bar"; 398 target: "efl.draggable.vertical_bar";
399 } 399 }
400 program { 400 program {
401 signal: "mouse,down,1*"; source: "sb_vbar_p1"; 401 signal: "mouse,down,1*"; source: "sb_vbar_p1";
402 action: DRAG_VAL_PAGE 0.0 -1.0; 402 action: DRAG_VAL_PAGE 0.0 -1.0;
403 target: "efl.dragable.vertical_bar"; 403 target: "efl.draggable.vertical_bar";
404 } 404 }
405 program { 405 program {
406 signal: "mouse,down,1*"; source: "sb_vbar_p2"; 406 signal: "mouse,down,1*"; source: "sb_vbar_p2";
407 action: DRAG_VAL_PAGE 0.0 1.0; 407 action: DRAG_VAL_PAGE 0.0 1.0;
408 target: "efl.dragable.vertical_bar"; 408 target: "efl.draggable.vertical_bar";
409 } 409 }
410 program { 410 program {
411 signal: "efl,action,scroll"; source: "efl"; 411 signal: "efl,action,scroll"; source: "efl";
@@ -458,7 +458,7 @@ group { name: "efl/scroller";
458 rel1.relative: 1.0 0.0; 458 rel1.relative: 1.0 0.0;
459 rel1.to: "sb_hbar_a1"; 459 rel1.to: "sb_hbar_a1";
460 rel2.relative: 0.0 1.0; 460 rel2.relative: 0.0 1.0;
461 rel2.to: "efl.dragable.horizontal_bar"; 461 rel2.to: "efl.draggable.horizontal_bar";
462 fixed: 1 1; 462 fixed: 1 1;
463 } 463 }
464 } 464 }
@@ -467,13 +467,13 @@ group { name: "efl/scroller";
467 description { state: "default" 0.0; 467 description { state: "default" 0.0;
468 color: 0 0 0 0; 468 color: 0 0 0 0;
469 rel1.relative: 1.0 0.0; 469 rel1.relative: 1.0 0.0;
470 rel1.to: "efl.dragable.horizontal_bar"; 470 rel1.to: "efl.draggable.horizontal_bar";
471 rel2.relative: 0.0 1.0; 471 rel2.relative: 0.0 1.0;
472 rel2.to: "sb_hbar_a2"; 472 rel2.to: "sb_hbar_a2";
473 fixed: 1 1; 473 fixed: 1 1;
474 } 474 }
475 } 475 }
476 part { name: "efl.dragable.horizontal_bar"; type: RECT; required; 476 part { name: "efl.draggable.horizontal_bar"; type: RECT; required;
477 clip_to: "sb_hbar"; 477 clip_to: "sb_hbar";
478 scale: 1; 478 scale: 1;
479 dragable.x: 1 1 0; 479 dragable.x: 1 1 0;
@@ -521,8 +521,8 @@ group { name: "efl/scroller";
521 max: 2 4; 521 max: 2 4;
522 fixed: 1 1; 522 fixed: 1 1;
523 align: 0.0 1.0; 523 align: 0.0 1.0;
524 rel1.to: "efl.dragable.horizontal_bar"; 524 rel1.to: "efl.draggable.horizontal_bar";
525 rel2.to: "efl.dragable.horizontal_bar"; 525 rel2.to: "efl.draggable.horizontal_bar";
526 } 526 }
527 description { state: "hidden" 0.0; 527 description { state: "hidden" 0.0;
528 inherit: "default" 0.0; 528 inherit: "default" 0.0;
@@ -555,8 +555,8 @@ group { name: "efl/scroller";
555 max: 2 4; 555 max: 2 4;
556 fixed: 1 1; 556 fixed: 1 1;
557 align: 1.0 1.0; 557 align: 1.0 1.0;
558 rel1.to: "efl.dragable.horizontal_bar"; 558 rel1.to: "efl.draggable.horizontal_bar";
559 rel2.to: "efl.dragable.horizontal_bar"; 559 rel2.to: "efl.draggable.horizontal_bar";
560 } 560 }
561 description { state: "hidden" 0.0; 561 description { state: "hidden" 0.0;
562 inherit: "default" 0.0; 562 inherit: "default" 0.0;
@@ -607,7 +607,7 @@ group { name: "efl/scroller";
607 action: STATE_SET "default" 0.0; 607 action: STATE_SET "default" 0.0;
608 target: "sb_hbar"; 608 target: "sb_hbar";
609 target: "sb_hbar_show"; 609 target: "sb_hbar_show";
610 target: "efl.dragable.horizontal_bar"; 610 target: "efl.draggable.horizontal_bar";
611 target: "sb_hbar_a1"; 611 target: "sb_hbar_a1";
612 target: "sb_hbar_a2"; 612 target: "sb_hbar_a2";
613 target: "x_hbar_left_mapper"; 613 target: "x_hbar_left_mapper";
@@ -622,7 +622,7 @@ group { name: "efl/scroller";
622 action: STATE_SET "hidden" 0.0; 622 action: STATE_SET "hidden" 0.0;
623 target: "sb_hbar"; 623 target: "sb_hbar";
624 target: "sb_hbar_show"; 624 target: "sb_hbar_show";
625 target: "efl.dragable.horizontal_bar"; 625 target: "efl.draggable.horizontal_bar";
626 target: "sb_hbar_a1"; 626 target: "sb_hbar_a1";
627 target: "sb_hbar_a2"; 627 target: "sb_hbar_a2";
628 target: "x_hbar_left_mapper"; 628 target: "x_hbar_left_mapper";
@@ -646,7 +646,7 @@ group { name: "efl/scroller";
646 } 646 }
647 program { name: "drag_left"; 647 program { name: "drag_left";
648 action: DRAG_VAL_STEP -1.0 0.0; 648 action: DRAG_VAL_STEP -1.0 0.0;
649 target: "efl.dragable.horizontal_bar"; 649 target: "efl.draggable.horizontal_bar";
650 } 650 }
651 program { 651 program {
652 signal: "mouse,down,1*"; source: "sb_hbar_a2"; 652 signal: "mouse,down,1*"; source: "sb_hbar_a2";
@@ -662,17 +662,17 @@ group { name: "efl/scroller";
662 } 662 }
663 program { name: "drag_right"; 663 program { name: "drag_right";
664 action: DRAG_VAL_STEP 1.0 0.0; 664 action: DRAG_VAL_STEP 1.0 0.0;
665 target: "efl.dragable.horizontal_bar"; 665 target: "efl.draggable.horizontal_bar";
666 } 666 }
667 program { 667 program {
668 signal: "mouse,down,1*"; source: "sb_hbar_p1"; 668 signal: "mouse,down,1*"; source: "sb_hbar_p1";
669 action: DRAG_VAL_PAGE -1.0 0.0; 669 action: DRAG_VAL_PAGE -1.0 0.0;
670 target: "efl.dragable.horizontal_bar"; 670 target: "efl.draggable.horizontal_bar";
671 } 671 }
672 program { 672 program {
673 signal: "mouse,down,1*"; source: "sb_hbar_p2"; 673 signal: "mouse,down,1*"; source: "sb_hbar_p2";
674 action: DRAG_VAL_PAGE 1.0 0.0; 674 action: DRAG_VAL_PAGE 1.0 0.0;
675 target: "efl.dragable.horizontal_bar"; 675 target: "efl.draggable.horizontal_bar";
676 } 676 }
677 program { 677 program {
678 signal: "efl,action,scroll"; source: "efl"; 678 signal: "efl,action,scroll"; source: "efl";
@@ -909,9 +909,9 @@ group { name: "efl/scroller";
909 description { state: "default" 0.0; 909 description { state: "default" 0.0;
910 fixed: 1 1; 910 fixed: 1 1;
911 rel1.offset: 2 0; 911 rel1.offset: 2 0;
912 rel1.to: "efl.dragable.vertical_bar"; 912 rel1.to: "efl.draggable.vertical_bar";
913 rel2.offset: -3 -1; 913 rel2.offset: -3 -1;
914 rel2.to: "efl.dragable.vertical_bar"; 914 rel2.to: "efl.draggable.vertical_bar";
915 image.normal: "vgrad_med_lighter.png"; 915 image.normal: "vgrad_med_lighter.png";
916 fill.smooth: 0; 916 fill.smooth: 0;
917 min: 3 13; 917 min: 3 13;
@@ -1070,9 +1070,9 @@ group { name: "efl/scroller";
1070 description { state: "default" 0.0; 1070 description { state: "default" 0.0;
1071 fixed: 1 1; 1071 fixed: 1 1;
1072 rel1.offset: 0 2; 1072 rel1.offset: 0 2;
1073 rel1.to: "efl.dragable.horizontal_bar"; 1073 rel1.to: "efl.draggable.horizontal_bar";
1074 rel2.offset: -1 -3; 1074 rel2.offset: -1 -3;
1075 rel2.to: "efl.dragable.horizontal_bar"; 1075 rel2.to: "efl.draggable.horizontal_bar";
1076 image.normal: "vgrad_med_lighter.png"; 1076 image.normal: "vgrad_med_lighter.png";
1077 fill.smooth: 0; 1077 fill.smooth: 0;
1078 min: 13 3; 1078 min: 13 3;
@@ -1127,51 +1127,51 @@ group { name: "efl/scroller";
1127 } 1127 }
1128 programs { 1128 programs {
1129 program { 1129 program {
1130 signal: "mouse,down,1*"; source: "efl.dragable.vertical_bar"; 1130 signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
1131 action: STATE_SET "clicked" 0.0; 1131 action: STATE_SET "clicked" 0.0;
1132 target: "efl.dragable.vertical_bar"; 1132 target: "efl.draggable.vertical_bar";
1133 target: "shadow_vbar"; 1133 target: "shadow_vbar";
1134 target: "glow_vbar"; 1134 target: "glow_vbar";
1135 target: "center_glow_vbar"; 1135 target: "center_glow_vbar";
1136 } 1136 }
1137 program { 1137 program {
1138 signal: "mouse,down,*"; source: "efl.dragable.vertical_bar"; 1138 signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
1139 action: SIGNAL_EMIT "efl,vertical_bar,press" "efl"; 1139 action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
1140 } 1140 }
1141 program { 1141 program {
1142 signal: "mouse,up,1"; source: "efl.dragable.vertical_bar"; 1142 signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
1143 action: STATE_SET "default" 0.0; 1143 action: STATE_SET "default" 0.0;
1144 target: "efl.dragable.vertical_bar"; 1144 target: "efl.draggable.vertical_bar";
1145 target: "shadow_vbar"; 1145 target: "shadow_vbar";
1146 target: "glow_vbar"; 1146 target: "glow_vbar";
1147 target: "center_glow_vbar"; 1147 target: "center_glow_vbar";
1148 } 1148 }
1149 program { 1149 program {
1150 signal: "mouse,up,*"; source: "efl.dragable.vertical_bar"; 1150 signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
1151 action: SIGNAL_EMIT "efl,vbar,unpress" "efl"; 1151 action: SIGNAL_EMIT "efl,vbar,unpress" "efl";
1152 } 1152 }
1153 program { 1153 program {
1154 signal: "mouse,down,1*"; source: "efl.dragable.horizontal_bar"; 1154 signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
1155 action: STATE_SET "clicked" 0.0; 1155 action: STATE_SET "clicked" 0.0;
1156 target: "efl.dragable.horizontal_bar"; 1156 target: "efl.draggable.horizontal_bar";
1157 target: "shadow_hbar"; 1157 target: "shadow_hbar";
1158 target: "glow_hbar"; 1158 target: "glow_hbar";
1159 target: "center_glow_hbar"; 1159 target: "center_glow_hbar";
1160 } 1160 }
1161 program { 1161 program {
1162 signal: "mouse,down,*"; source: "efl.dragable.horizontal_bar"; 1162 signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
1163 action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl"; 1163 action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
1164 } 1164 }
1165 program { 1165 program {
1166 signal: "mouse,up,1"; source: "efl.dragable.horizontal_bar"; 1166 signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
1167 action: STATE_SET "default" 0.0; 1167 action: STATE_SET "default" 0.0;
1168 target: "efl.dragable.horizontal_bar"; 1168 target: "efl.draggable.horizontal_bar";
1169 target: "shadow_hbar"; 1169 target: "shadow_hbar";
1170 target: "glow_hbar"; 1170 target: "glow_hbar";
1171 target: "center_glow_hbar"; 1171 target: "center_glow_hbar";
1172 } 1172 }
1173 program { 1173 program {
1174 signal: "mouse,up,*"; source: "efl.dragable.horizontal_bar"; 1174 signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
1175 action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl"; 1175 action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
1176 } 1176 }
1177 } 1177 }
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 @@
1/** 1/**
2Group: efl/slider/horizontal (@since 1.23) 2Group: efl/slider/horizontal (@since 1.23)
3 Part Rectangle: efl.dragable.slider 3 Part Rectangle: efl.draggable.slider
4 Part Swallow: efl.bar 4 Part Swallow: efl.bar
5 Signal: efl,state,disabled 5 Signal: efl,state,disabled
6 Signal: efl,state,enabled 6 Signal: efl,state,enabled
7 Signal: efl,state,inverted,off 7 Signal: efl,state,inverted,off
8 Signal: efl,state,inverted,on 8 Signal: efl,state,inverted,on
9Group: efl/slider/vertical (@since 1.23) 9Group: efl/slider/vertical (@since 1.23)
10 Part Rectangle: efl.dragable.slider 10 Part Rectangle: efl.draggable.slider
11 Part Swallow: efl.bar 11 Part Swallow: efl.bar
12 Signal: efl,state,disabled 12 Signal: efl,state,disabled
13 Signal: efl,state,enabled 13 Signal: efl,state,enabled
@@ -105,7 +105,7 @@ group { "efl/slider/horizontal";
105 rel1.to: "base"; 105 rel1.to: "base";
106 rel2.relative: 0.5 1.0; 106 rel2.relative: 0.5 1.0;
107 rel2.offset: -1 -2; 107 rel2.offset: -1 -2;
108 rel2.to_x: "efl.dragable.slider"; 108 rel2.to_x: "efl.draggable.slider";
109 rel2.to_y: "base"; 109 rel2.to_y: "base";
110 image.border: 0 4 0 0; 110 image.border: 0 4 0 0;
111 } 111 }
@@ -117,7 +117,7 @@ group { "efl/slider/horizontal";
117 image.normal: "horiz_glow_run_rev.png"; 117 image.normal: "horiz_glow_run_rev.png";
118 rel1.relative: 0.5 0.0; 118 rel1.relative: 0.5 0.0;
119 rel1.offset: 0 1; 119 rel1.offset: 0 1;
120 rel1.to_x: "efl.dragable.slider"; 120 rel1.to_x: "efl.draggable.slider";
121 rel1.to_y: "base"; 121 rel1.to_y: "base";
122 rel2.offset: -2 -2; 122 rel2.offset: -2 -2;
123 rel2.to: "base"; 123 rel2.to: "base";
@@ -137,7 +137,7 @@ group { "efl/slider/horizontal";
137 fill.smooth: 0; 137 fill.smooth: 0;
138 } 138 }
139 } 139 }
140 part { name: "efl.dragable.slider"; type: RECT; 140 part { name: "efl.draggable.slider"; type: RECT;
141 nomouse; 141 nomouse;
142 scale: 1; 142 scale: 1;
143 dragable.x: 1 1 0; 143 dragable.x: 1 1 0;
@@ -162,9 +162,9 @@ group { "efl/slider/horizontal";
162 min: 12 12; 162 min: 12 12;
163 step: 2 2; 163 step: 2 2;
164 max: 32 32; // XXX allow bigger sizes with more knob images 164 max: 32 32; // XXX allow bigger sizes with more knob images
165 rel1.to: "efl.dragable.slider"; 165 rel1.to: "efl.draggable.slider";
166 rel1.offset: -4 -4; 166 rel1.offset: -4 -4;
167 rel2.to: "efl.dragable.slider"; 167 rel2.to: "efl.draggable.slider";
168 rel2.offset: 3 3; 168 rel2.offset: 3 3;
169 } 169 }
170 description { state: "clicked" 0.0; 170 description { state: "clicked" 0.0;
@@ -175,11 +175,11 @@ group { "efl/slider/horizontal";
175 nomouse; 175 nomouse;
176 scale: 1; 176 scale: 1;
177 ignore_flags: ON_HOLD; 177 ignore_flags: ON_HOLD;
178 dragable.events: "efl.dragable.slider"; 178 dragable.events: "efl.draggable.slider";
179 description { state: "default" 0.0; 179 description { state: "default" 0.0;
180 fixed: 1 1; 180 fixed: 1 1;
181 rel1.to: "efl.dragable.slider"; 181 rel1.to: "efl.draggable.slider";
182 rel2.to: "efl.dragable.slider"; 182 rel2.to: "efl.draggable.slider";
183 color: 0 0 0 0; 183 color: 0 0 0 0;
184 } 184 }
185 } 185 }
@@ -196,12 +196,12 @@ group { "efl/slider/horizontal";
196 } 196 }
197 programs { 197 programs {
198 program { 198 program {
199 signal: "mouse,down,1"; source: "efl.dragable.slider"; 199 signal: "mouse,down,1"; source: "efl.draggable.slider";
200 action: STATE_SET "clicked" 0.0; 200 action: STATE_SET "clicked" 0.0;
201 target: "knob"; 201 target: "knob";
202 } 202 }
203 program { 203 program {
204 signal: "mouse,up,1"; source: "efl.dragable.slider"; 204 signal: "mouse,up,1"; source: "efl.draggable.slider";
205 action: STATE_SET "default" 0.0; 205 action: STATE_SET "default" 0.0;
206 target: "knob"; 206 target: "knob";
207 } 207 }
@@ -332,7 +332,7 @@ group { "efl/slider/vertical";
332 image.normal: "vert_glow_run.png"; 332 image.normal: "vert_glow_run.png";
333 rel1.relative: 0.0 0.5; 333 rel1.relative: 0.0 0.5;
334 rel1.offset: 1 0; 334 rel1.offset: 1 0;
335 rel1.to_y: "efl.dragable.slider"; 335 rel1.to_y: "efl.draggable.slider";
336 rel1.to_x: "base"; 336 rel1.to_x: "base";
337 rel2.offset: -2 -2; 337 rel2.offset: -2 -2;
338 rel2.to: "base"; 338 rel2.to: "base";
@@ -348,7 +348,7 @@ group { "efl/slider/vertical";
348 rel1.to: "base"; 348 rel1.to: "base";
349 rel2.relative: 1.0 0.5; 349 rel2.relative: 1.0 0.5;
350 rel2.offset: -2 -1; 350 rel2.offset: -2 -1;
351 rel2.to_y: "efl.dragable.slider"; 351 rel2.to_y: "efl.draggable.slider";
352 rel2.to_x: "base"; 352 rel2.to_x: "base";
353 image.border: 0 0 0 4; 353 image.border: 0 0 0 4;
354 } 354 }
@@ -366,7 +366,7 @@ group { "efl/slider/vertical";
366 fill.smooth: 0; 366 fill.smooth: 0;
367 } 367 }
368 } 368 }
369 part { name: "efl.dragable.slider"; type: RECT; 369 part { name: "efl.draggable.slider"; type: RECT;
370 nomouse; 370 nomouse;
371 scale: 1; 371 scale: 1;
372 dragable.x: 0 0 0; 372 dragable.x: 0 0 0;
@@ -391,9 +391,9 @@ group { "efl/slider/vertical";
391 min: 12 12; 391 min: 12 12;
392 step: 2 2; 392 step: 2 2;
393 max: 32 32; // XXX allow bigger sizes with more knob images 393 max: 32 32; // XXX allow bigger sizes with more knob images
394 rel1.to: "efl.dragable.slider"; 394 rel1.to: "efl.draggable.slider";
395 rel1.offset: -4 -4; 395 rel1.offset: -4 -4;
396 rel2.to: "efl.dragable.slider"; 396 rel2.to: "efl.draggable.slider";
397 rel2.offset: 3 3; 397 rel2.offset: 3 3;
398 } 398 }
399 description { state: "clicked" 0.0; 399 description { state: "clicked" 0.0;
@@ -404,11 +404,11 @@ group { "efl/slider/vertical";
404 nomouse; 404 nomouse;
405 scale: 1; 405 scale: 1;
406 ignore_flags: ON_HOLD; 406 ignore_flags: ON_HOLD;
407 dragable.events: "efl.dragable.slider"; 407 dragable.events: "efl.draggable.slider";
408 description { state: "default" 0.0; 408 description { state: "default" 0.0;
409 fixed: 1 1; 409 fixed: 1 1;
410 rel1.to: "efl.dragable.slider"; 410 rel1.to: "efl.draggable.slider";
411 rel2.to: "efl.dragable.slider"; 411 rel2.to: "efl.draggable.slider";
412 color: 0 0 0 0; 412 color: 0 0 0 0;
413 } 413 }
414 } 414 }
@@ -425,12 +425,12 @@ group { "efl/slider/vertical";
425 } 425 }
426 programs { 426 programs {
427 program { 427 program {
428 signal: "mouse,down,1"; source: "efl.dragable.slider"; 428 signal: "mouse,down,1"; source: "efl.draggable.slider";
429 action: STATE_SET "clicked" 0.0; 429 action: STATE_SET "clicked" 0.0;
430 target: "knob"; 430 target: "knob";
431 } 431 }
432 program { 432 program {
433 signal: "mouse,up,1"; source: "efl.dragable.slider"; 433 signal: "mouse,up,1"; source: "efl.draggable.slider";
434 action: STATE_SET "default" 0.0; 434 action: STATE_SET "default" 0.0;
435 target: "knob"; 435 target: "knob";
436 } 436 }
@@ -568,11 +568,11 @@ group { "efl/slider_interval/horizontal";
568 image.normal: "horiz_glow_range.png"; 568 image.normal: "horiz_glow_range.png";
569 rel1.relative: 0.5 1.0; 569 rel1.relative: 0.5 1.0;
570 rel1.offset: -1 -2; 570 rel1.offset: -1 -2;
571 rel1.to_x: "efl.dragable.slider"; 571 rel1.to_x: "efl.draggable.slider";
572 rel1.to_y: "base"; 572 rel1.to_y: "base";
573 rel2.relative: 0.5 1.0; 573 rel2.relative: 0.5 1.0;
574 rel2.offset: -1 -2; 574 rel2.offset: -1 -2;
575 rel2.to_x: "efl.dragable2.slider"; 575 rel2.to_x: "efl.draggable2.slider";
576 rel2.to_y: "base"; 576 rel2.to_y: "base";
577 fixed: 0 1; 577 fixed: 0 1;
578 image.border: 0 4 0 0; 578 image.border: 0 4 0 0;
@@ -583,8 +583,8 @@ group { "efl/slider_interval/horizontal";
583 } 583 }
584 description { state: "range_reverse" 0.0; 584 description { state: "range_reverse" 0.0;
585 inherit: "default" 0.0; 585 inherit: "default" 0.0;
586 rel1.to_x: "efl.dragable2.slider"; 586 rel1.to_x: "efl.draggable2.slider";
587 rel2.to_x: "efl.dragable.slider"; 587 rel2.to_x: "efl.draggable.slider";
588 } 588 }
589 description { state: "disabled_range_reverse" 0.0; 589 description { state: "disabled_range_reverse" 0.0;
590 inherit: "range_reverse" 0.0; 590 inherit: "range_reverse" 0.0;
@@ -600,7 +600,7 @@ group { "efl/slider_interval/horizontal";
600 fill.smooth: 0; 600 fill.smooth: 0;
601 } 601 }
602 } 602 }
603 part { name: "efl.dragable.slider"; type: RECT; 603 part { name: "efl.draggable.slider"; type: RECT;
604 nomouse; 604 nomouse;
605 scale: 1; 605 scale: 1;
606 dragable.x: 1 1 0; 606 dragable.x: 1 1 0;
@@ -625,9 +625,9 @@ group { "efl/slider_interval/horizontal";
625 min: 12 12; 625 min: 12 12;
626 step: 2 2; 626 step: 2 2;
627 max: 32 32; // XXX allow bigger sizes with more knob images 627 max: 32 32; // XXX allow bigger sizes with more knob images
628 rel1.to: "efl.dragable.slider"; 628 rel1.to: "efl.draggable.slider";
629 rel1.offset: -4 -4; 629 rel1.offset: -4 -4;
630 rel2.to: "efl.dragable.slider"; 630 rel2.to: "efl.draggable.slider";
631 rel2.offset: 3 3; 631 rel2.offset: 3 3;
632 } 632 }
633 description { state: "clicked" 0.0; 633 description { state: "clicked" 0.0;
@@ -638,15 +638,15 @@ group { "efl/slider_interval/horizontal";
638 nomouse; 638 nomouse;
639 scale: 1; 639 scale: 1;
640 ignore_flags: ON_HOLD; 640 ignore_flags: ON_HOLD;
641 dragable.events: "efl.dragable.slider"; 641 dragable.events: "efl.draggable.slider";
642 description { state: "default" 0.0; 642 description { state: "default" 0.0;
643 fixed: 1 1; 643 fixed: 1 1;
644 rel1.to: "efl.dragable.slider"; 644 rel1.to: "efl.draggable.slider";
645 rel2.to: "efl.dragable.slider"; 645 rel2.to: "efl.draggable.slider";
646 color: 0 0 0 0; 646 color: 0 0 0 0;
647 } 647 }
648 } 648 }
649 part { name: "efl.dragable2.slider"; type: RECT; 649 part { name: "efl.draggable2.slider"; type: RECT;
650 nomouse; 650 nomouse;
651 scale: 1; 651 scale: 1;
652 dragable.x: 1 1 0; 652 dragable.x: 1 1 0;
@@ -671,9 +671,9 @@ group { "efl/slider_interval/horizontal";
671 min: 12 12; 671 min: 12 12;
672 step: 2 2; 672 step: 2 2;
673 max: 32 32; // XXX allow bigger sizes with more knob images 673 max: 32 32; // XXX allow bigger sizes with more knob images
674 rel1.to: "efl.dragable2.slider"; 674 rel1.to: "efl.draggable2.slider";
675 rel1.offset: -4 -4; 675 rel1.offset: -4 -4;
676 rel2.to: "efl.dragable2.slider"; 676 rel2.to: "efl.draggable2.slider";
677 rel2.offset: 3 3; 677 rel2.offset: 3 3;
678 } 678 }
679 description { state: "clicked" 0.0; 679 description { state: "clicked" 0.0;
@@ -684,11 +684,11 @@ group { "efl/slider_interval/horizontal";
684 nomouse; 684 nomouse;
685 scale: 1; 685 scale: 1;
686 ignore_flags: ON_HOLD; 686 ignore_flags: ON_HOLD;
687 dragable.events: "efl.dragable2.slider"; 687 dragable.events: "efl.draggable2.slider";
688 description { state: "default" 0.0; 688 description { state: "default" 0.0;
689 fixed: 1 1; 689 fixed: 1 1;
690 rel1.to: "efl.dragable2.slider"; 690 rel1.to: "efl.draggable2.slider";
691 rel2.to: "efl.dragable2.slider"; 691 rel2.to: "efl.draggable2.slider";
692 color: 0 0 0 0; 692 color: 0 0 0 0;
693 } 693 }
694 } 694 }
@@ -705,18 +705,18 @@ group { "efl/slider_interval/horizontal";
705 } 705 }
706 programs { 706 programs {
707 program { 707 program {
708 signal: "mouse,down,1"; source: "efl.dragable.slider"; 708 signal: "mouse,down,1"; source: "efl.draggable.slider";
709 action: STATE_SET "clicked" 0.0; 709 action: STATE_SET "clicked" 0.0;
710 target: "knob"; 710 target: "knob";
711 } 711 }
712 program { 712 program {
713 signal: "mouse,up,1"; source: "efl.dragable.slider"; 713 signal: "mouse,up,1"; source: "efl.draggable.slider";
714 action: STATE_SET "default" 0.0; 714 action: STATE_SET "default" 0.0;
715 target: "knob"; 715 target: "knob";
716 } 716 }
717 program { 717 program {
718 signal: "drag"; 718 signal: "drag";
719 source: "efl.dragable*"; 719 source: "efl.draggable*";
720 script { 720 script {
721 update_glow(); 721 update_glow();
722 } 722 }
@@ -837,11 +837,11 @@ group { "efl/slider_interval/vertical";
837 rel1.relative: 0.5 1.0; 837 rel1.relative: 0.5 1.0;
838 rel1.offset: -1 -2; 838 rel1.offset: -1 -2;
839 rel1.to_x: "base"; 839 rel1.to_x: "base";
840 rel1.to_y: "efl.dragable.slider"; 840 rel1.to_y: "efl.draggable.slider";
841 rel2.relative: 0.5 1.0; 841 rel2.relative: 0.5 1.0;
842 rel2.offset: -1 -2; 842 rel2.offset: -1 -2;
843 rel2.to_x: "base"; 843 rel2.to_x: "base";
844 rel2.to_y: "efl.dragable2.slider"; 844 rel2.to_y: "efl.draggable2.slider";
845 fixed: 1 0; 845 fixed: 1 0;
846 image.border: 0 4 0 0; 846 image.border: 0 4 0 0;
847 } 847 }
@@ -851,8 +851,8 @@ group { "efl/slider_interval/vertical";
851 } 851 }
852 description { state: "range_reverse" 0.0; 852 description { state: "range_reverse" 0.0;
853 inherit: "default" 0.0; 853 inherit: "default" 0.0;
854 rel1.to_y: "efl.dragable2.slider"; 854 rel1.to_y: "efl.draggable2.slider";
855 rel2.to_y: "efl.dragable.slider"; 855 rel2.to_y: "efl.draggable.slider";
856 } 856 }
857 description { state: "disabled_range_reverse" 0.0; 857 description { state: "disabled_range_reverse" 0.0;
858 inherit: "range_reverse" 0.0; 858 inherit: "range_reverse" 0.0;
@@ -868,7 +868,7 @@ group { "efl/slider_interval/vertical";
868 fill.smooth: 0; 868 fill.smooth: 0;
869 } 869 }
870 } 870 }
871 part { name: "efl.dragable.slider"; type: RECT; 871 part { name: "efl.draggable.slider"; type: RECT;
872 nomouse; 872 nomouse;
873 scale: 1; 873 scale: 1;
874 dragable.x: 0 0 0; 874 dragable.x: 0 0 0;
@@ -893,9 +893,9 @@ group { "efl/slider_interval/vertical";
893 min: 12 12; 893 min: 12 12;
894 step: 2 2; 894 step: 2 2;
895 max: 32 32; // XXX allow bigger sizes with more knob images 895 max: 32 32; // XXX allow bigger sizes with more knob images
896 rel1.to: "efl.dragable.slider"; 896 rel1.to: "efl.draggable.slider";
897 rel1.offset: -4 -4; 897 rel1.offset: -4 -4;
898 rel2.to: "efl.dragable.slider"; 898 rel2.to: "efl.draggable.slider";
899 rel2.offset: 3 3; 899 rel2.offset: 3 3;
900 } 900 }
901 description { state: "clicked" 0.0; 901 description { state: "clicked" 0.0;
@@ -906,15 +906,15 @@ group { "efl/slider_interval/vertical";
906 nomouse; 906 nomouse;
907 scale: 1; 907 scale: 1;
908 ignore_flags: ON_HOLD; 908 ignore_flags: ON_HOLD;
909 dragable.events: "efl.dragable.slider"; 909 dragable.events: "efl.draggable.slider";
910 description { state: "default" 0.0; 910 description { state: "default" 0.0;
911 fixed: 1 1; 911 fixed: 1 1;
912 rel1.to: "efl.dragable.slider"; 912 rel1.to: "efl.draggable.slider";
913 rel2.to: "efl.dragable.slider"; 913 rel2.to: "efl.draggable.slider";
914 color: 0 0 0 0; 914 color: 0 0 0 0;
915 } 915 }
916 } 916 }
917 part { name: "efl.dragable2.slider"; type: RECT; 917 part { name: "efl.draggable2.slider"; type: RECT;
918 nomouse; 918 nomouse;
919 scale: 1; 919 scale: 1;
920 dragable.x: 0 0 0; 920 dragable.x: 0 0 0;
@@ -939,9 +939,9 @@ group { "efl/slider_interval/vertical";
939 min: 12 12; 939 min: 12 12;
940 step: 2 2; 940 step: 2 2;
941 max: 32 32; // XXX allow bigger sizes with more knob images 941 max: 32 32; // XXX allow bigger sizes with more knob images
942 rel1.to: "efl.dragable2.slider"; 942 rel1.to: "efl.draggable2.slider";
943 rel1.offset: -4 -4; 943 rel1.offset: -4 -4;
944 rel2.to: "efl.dragable2.slider"; 944 rel2.to: "efl.draggable2.slider";
945 rel2.offset: 3 3; 945 rel2.offset: 3 3;
946 } 946 }
947 description { state: "clicked" 0.0; 947 description { state: "clicked" 0.0;
@@ -952,11 +952,11 @@ group { "efl/slider_interval/vertical";
952 nomouse; 952 nomouse;
953 scale: 1; 953 scale: 1;
954 ignore_flags: ON_HOLD; 954 ignore_flags: ON_HOLD;
955 dragable.events: "efl.dragable2.slider"; 955 dragable.events: "efl.draggable2.slider";
956 description { state: "default" 0.0; 956 description { state: "default" 0.0;
957 fixed: 1 1; 957 fixed: 1 1;
958 rel1.to: "efl.dragable2.slider"; 958 rel1.to: "efl.draggable2.slider";
959 rel2.to: "efl.dragable2.slider"; 959 rel2.to: "efl.draggable2.slider";
960 color: 0 0 0 0; 960 color: 0 0 0 0;
961 } 961 }
962 } 962 }
@@ -973,18 +973,18 @@ group { "efl/slider_interval/vertical";
973 } 973 }
974 programs { 974 programs {
975 program { 975 program {
976 signal: "mouse,down,1"; source: "efl.dragable.slider"; 976 signal: "mouse,down,1"; source: "efl.draggable.slider";
977 action: STATE_SET "clicked" 0.0; 977 action: STATE_SET "clicked" 0.0;
978 target: "knob"; 978 target: "knob";
979 } 979 }
980 program { 980 program {
981 signal: "mouse,up,1"; source: "efl.dragable.slider"; 981 signal: "mouse,up,1"; source: "efl.draggable.slider";
982 action: STATE_SET "default" 0.0; 982 action: STATE_SET "default" 0.0;
983 target: "knob"; 983 target: "knob";
984 } 984 }
985 program { 985 program {
986 signal: "drag"; 986 signal: "drag";
987 source: "efl.dragable*"; 987 source: "efl.draggable*";
988 script { 988 script {
989 update_glow(); 989 update_glow();
990 } 990 }
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";
185 visible: 0; 185 visible: 0;
186 } 186 }
187 } 187 }
188 part { name: "efl.dragable.vertical_bar"; type: RECT; 188 part { name: "efl.draggable.vertical_bar"; type: RECT;
189 dragable.x: 0 0 0; 189 dragable.x: 0 0 0;
190 dragable.y: 1 1 0; 190 dragable.y: 1 1 0;
191 dragable.confine: "sb_vbar_base"; 191 dragable.confine: "sb_vbar_base";
@@ -205,7 +205,7 @@ group { "efl/text/single/scroller";
205 visible: 0; 205 visible: 0;
206 } 206 }
207 } 207 }
208 part { name: "efl.dragable.horizontal_bar"; type: RECT; 208 part { name: "efl.draggable.horizontal_bar"; type: RECT;
209 dragable.x: 1 1 0; 209 dragable.x: 1 1 0;
210 dragable.y: 0 0 0; 210 dragable.y: 0 0 0;
211 dragable.confine: "sb_hbar_base"; 211 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)
1367 else 1367 else
1368 { 1368 {
1369 edje_object_part_drag_value_get 1369 edje_object_part_drag_value_get
1370 (wd->resize_obj, "efl.dragable.vertical_bar", NULL, &vy); 1370 (wd->resize_obj, "efl.draggable.vertical_bar", NULL, &vy);
1371 edje_object_part_drag_value_get 1371 edje_object_part_drag_value_get
1372 (wd->resize_obj, "efl.dragable.horizontal_bar", &vx, NULL); 1372 (wd->resize_obj, "efl.draggable.horizontal_bar", &vx, NULL);
1373 } 1373 }
1374 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy); 1374 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
1375} 1375}
@@ -1505,8 +1505,8 @@ _efl_ui_image_zoomable_bar_size_changed_cb(void *data, const Efl_Event *event EI
1505 } 1505 }
1506 else 1506 else
1507 { 1507 {
1508 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.horizontal_bar", width, 1.0); 1508 edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.horizontal_bar", width, 1.0);
1509 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vertical_bar", 1.0, height); 1509 edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.vertical_bar", 1.0, height);
1510 } 1510 }
1511} 1511}
1512 1512
@@ -1528,8 +1528,8 @@ _efl_ui_image_zoomable_bar_pos_changed_cb(void *data, const Efl_Event *event EIN
1528 } 1528 }
1529 else 1529 else
1530 { 1530 {
1531 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.horizontal_bar", posx, 0.0); 1531 edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.horizontal_bar", posx, 0.0);
1532 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vertical_bar", 0.0, posy); 1532 edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.vertical_bar", 0.0, posy);
1533 } 1533 }
1534} 1534}
1535 1535
@@ -1640,22 +1640,22 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1640 efl_layout_signal_callback_add 1640 efl_layout_signal_callback_add
1641 (obj, "reload", "efl", obj, _efl_ui_image_zoomable_reload_cb, NULL); 1641 (obj, "reload", "efl", obj, _efl_ui_image_zoomable_reload_cb, NULL);
1642 efl_layout_signal_callback_add 1642 efl_layout_signal_callback_add
1643 (obj, "drag", "efl.dragable.vertical_bar", 1643 (obj, "drag", "efl.draggable.vertical_bar",
1644 obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL); 1644 obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL);
1645 efl_layout_signal_callback_add 1645 efl_layout_signal_callback_add
1646 (obj, "drag,set", "efl.dragable.vertical_bar", 1646 (obj, "drag,set", "efl.draggable.vertical_bar",
1647 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1647 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1648 efl_layout_signal_callback_add 1648 efl_layout_signal_callback_add
1649 (obj, "drag,start", "efl.dragable.vertical_bar", 1649 (obj, "drag,start", "efl.draggable.vertical_bar",
1650 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL); 1650 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
1651 efl_layout_signal_callback_add 1651 efl_layout_signal_callback_add
1652 (obj, "drag,stop", "efl.dragable.vertical_bar", 1652 (obj, "drag,stop", "efl.draggable.vertical_bar",
1653 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL); 1653 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
1654 efl_layout_signal_callback_add 1654 efl_layout_signal_callback_add
1655 (obj, "drag,step", "efl.dragable.vertical_bar", 1655 (obj, "drag,step", "efl.draggable.vertical_bar",
1656 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1656 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1657 efl_layout_signal_callback_add 1657 efl_layout_signal_callback_add
1658 (obj, "drag,page", "efl.dragable.vertical_bar", 1658 (obj, "drag,page", "efl.draggable.vertical_bar",
1659 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1659 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1660 efl_layout_signal_callback_add 1660 efl_layout_signal_callback_add
1661 (obj, "efl,vertical_bar,press", "efl", 1661 (obj, "efl,vertical_bar,press", "efl",
@@ -1664,22 +1664,22 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1664 (obj, "efl,vbar,unpress", "efl", 1664 (obj, "efl,vbar,unpress", "efl",
1665 obj, _efl_ui_image_zoomable_vbar_unpress_cb, NULL); 1665 obj, _efl_ui_image_zoomable_vbar_unpress_cb, NULL);
1666 efl_layout_signal_callback_add 1666 efl_layout_signal_callback_add
1667 (obj, "drag", "efl.dragable.horizontal_bar", 1667 (obj, "drag", "efl.draggable.horizontal_bar",
1668 obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL); 1668 obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL);
1669 efl_layout_signal_callback_add 1669 efl_layout_signal_callback_add
1670 (obj, "drag,set", "efl.dragable.horizontal_bar", 1670 (obj, "drag,set", "efl.draggable.horizontal_bar",
1671 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1671 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1672 efl_layout_signal_callback_add 1672 efl_layout_signal_callback_add
1673 (obj, "drag,start", "efl.dragable.horizontal_bar", 1673 (obj, "drag,start", "efl.draggable.horizontal_bar",
1674 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL); 1674 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
1675 efl_layout_signal_callback_add 1675 efl_layout_signal_callback_add
1676 (obj, "drag,stop", "efl.dragable.horizontal_bar", 1676 (obj, "drag,stop", "efl.draggable.horizontal_bar",
1677 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL); 1677 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
1678 efl_layout_signal_callback_add 1678 efl_layout_signal_callback_add
1679 (obj, "drag,step", "efl.dragable.horizontal_bar", 1679 (obj, "drag,step", "efl.draggable.horizontal_bar",
1680 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1680 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1681 efl_layout_signal_callback_add 1681 efl_layout_signal_callback_add
1682 (obj, "drag,page", "efl.dragable.horizontal_bar", 1682 (obj, "drag,page", "efl.draggable.horizontal_bar",
1683 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1683 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1684 efl_layout_signal_callback_add 1684 efl_layout_signal_callback_add
1685 (obj, "efl,horizontal_bar,press", "efl", 1685 (obj, "efl,horizontal_bar,press", "efl",
@@ -1751,22 +1751,22 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1751 efl_layout_signal_callback_del 1751 efl_layout_signal_callback_del
1752 (obj, "reload", "efl", obj, _efl_ui_image_zoomable_reload_cb, NULL); 1752 (obj, "reload", "efl", obj, _efl_ui_image_zoomable_reload_cb, NULL);
1753 efl_layout_signal_callback_del 1753 efl_layout_signal_callback_del
1754 (obj, "drag", "efl.dragable.vertical_bar", 1754 (obj, "drag", "efl.draggable.vertical_bar",
1755 obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL); 1755 obj, _efl_ui_image_zoomable_vbar_drag_cb, NULL);
1756 efl_layout_signal_callback_del 1756 efl_layout_signal_callback_del
1757 (obj, "drag,set", "efl.dragable.vertical_bar", 1757 (obj, "drag,set", "efl.draggable.vertical_bar",
1758 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1758 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1759 efl_layout_signal_callback_del 1759 efl_layout_signal_callback_del
1760 (obj, "drag,start", "efl.dragable.vertical_bar", 1760 (obj, "drag,start", "efl.draggable.vertical_bar",
1761 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL); 1761 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
1762 efl_layout_signal_callback_del 1762 efl_layout_signal_callback_del
1763 (obj, "drag,stop", "efl.dragable.vertical_bar", 1763 (obj, "drag,stop", "efl.draggable.vertical_bar",
1764 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL); 1764 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
1765 efl_layout_signal_callback_del 1765 efl_layout_signal_callback_del
1766 (obj, "drag,step", "efl.dragable.vertical_bar", 1766 (obj, "drag,step", "efl.draggable.vertical_bar",
1767 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1767 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1768 efl_layout_signal_callback_del 1768 efl_layout_signal_callback_del
1769 (obj, "drag,page", "efl.dragable.vertical_bar", 1769 (obj, "drag,page", "efl.draggable.vertical_bar",
1770 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1770 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1771 efl_layout_signal_callback_del 1771 efl_layout_signal_callback_del
1772 (obj, "efl,vertical_bar,press", "efl", 1772 (obj, "efl,vertical_bar,press", "efl",
@@ -1775,22 +1775,22 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1775 (obj, "efl,vbar,unpress", "efl", 1775 (obj, "efl,vbar,unpress", "efl",
1776 obj, _efl_ui_image_zoomable_vbar_unpress_cb, NULL); 1776 obj, _efl_ui_image_zoomable_vbar_unpress_cb, NULL);
1777 efl_layout_signal_callback_del 1777 efl_layout_signal_callback_del
1778 (obj, "drag", "efl.dragable.horizontal_bar", 1778 (obj, "drag", "efl.draggable.horizontal_bar",
1779 obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL); 1779 obj, _efl_ui_image_zoomable_hbar_drag_cb, NULL);
1780 efl_layout_signal_callback_del 1780 efl_layout_signal_callback_del
1781 (obj, "drag,set", "efl.dragable.horizontal_bar", 1781 (obj, "drag,set", "efl.draggable.horizontal_bar",
1782 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1782 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1783 efl_layout_signal_callback_del 1783 efl_layout_signal_callback_del
1784 (obj, "drag,start", "efl.dragable.horizontal_bar", 1784 (obj, "drag,start", "efl.draggable.horizontal_bar",
1785 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL); 1785 obj, _efl_ui_image_zoomable_edje_drag_start_cb, NULL);
1786 efl_layout_signal_callback_del 1786 efl_layout_signal_callback_del
1787 (obj, "drag,stop", "efl.dragable.horizontal_bar", 1787 (obj, "drag,stop", "efl.draggable.horizontal_bar",
1788 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL); 1788 obj, _efl_ui_image_zoomable_edje_drag_stop_cb, NULL);
1789 efl_layout_signal_callback_del 1789 efl_layout_signal_callback_del
1790 (obj, "drag,step", "efl.dragable.horizontal_bar", 1790 (obj, "drag,step", "efl.draggable.horizontal_bar",
1791 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1791 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1792 efl_layout_signal_callback_del 1792 efl_layout_signal_callback_del
1793 (obj, "drag,page", "efl.dragable.horizontal_bar", 1793 (obj, "drag,page", "efl.draggable.horizontal_bar",
1794 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); 1794 obj, _efl_ui_image_zoomable_edje_drag_cb, NULL);
1795 efl_layout_signal_callback_del 1795 efl_layout_signal_callback_del
1796 (obj, "efl,horizontal_bar,press", "efl", 1796 (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)
23 double vx = 0.0, vy = 0.0; 23 double vx = 0.0, vy = 0.0;
24 24
25 edje_object_part_drag_value_get 25 edje_object_part_drag_value_get
26 (wd->resize_obj, "efl.dragable.vertical_bar", NULL, &vy); 26 (wd->resize_obj, "efl.draggable.vertical_bar", NULL, &vy);
27 27
28 edje_object_part_drag_value_get 28 edje_object_part_drag_value_get
29 (wd->resize_obj, "efl.dragable.horizontal_bar", &vx, NULL); 29 (wd->resize_obj, "efl.draggable.horizontal_bar", &vx, NULL);
30 30
31 efl_ui_scrollbar_bar_position_set(ctx->smanager, vx, vy); 31 efl_ui_scrollbar_bar_position_set(ctx->smanager, vx, vy);
32} 32}
@@ -185,8 +185,8 @@ _scroll_connector_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UN
185 185
186 edje_object_calc_force(wd->resize_obj); 186 edje_object_calc_force(wd->resize_obj);
187 efl_ui_scrollbar_bar_size_get(ctx->smanager, &width, &height); 187 efl_ui_scrollbar_bar_size_get(ctx->smanager, &width, &height);
188 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.horizontal_bar", width, 1.0); 188 edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.horizontal_bar", width, 1.0);
189 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vertical_bar", 1.0, height); 189 edje_object_part_drag_size_set(wd->resize_obj, "efl.draggable.vertical_bar", 1.0, height);
190} 190}
191 191
192static void 192static void
@@ -202,14 +202,14 @@ _scroll_connector_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNU
202 step = efl_ui_scrollable_step_size_get(ctx->smanager); 202 step = efl_ui_scrollable_step_size_get(ctx->smanager);
203 cs = efl_ui_scrollable_content_size_get(ctx->smanager); 203 cs = efl_ui_scrollable_content_size_get(ctx->smanager);
204 204
205 edje_object_part_drag_step_set(wd->resize_obj, "efl.dragable.horizontal_bar", 205 edje_object_part_drag_step_set(wd->resize_obj, "efl.draggable.horizontal_bar",
206 (double)step.x / cs.w, 0.0); 206 (double)step.x / cs.w, 0.0);
207 edje_object_part_drag_step_set(wd->resize_obj, "efl.dragable.vertical_bar", 207 edje_object_part_drag_step_set(wd->resize_obj, "efl.draggable.vertical_bar",
208 0.0, (double)step.y / cs.h); 208 0.0, (double)step.y / cs.h);
209 209
210 efl_ui_scrollbar_bar_position_get(ctx->smanager, &posx, &posy); 210 efl_ui_scrollbar_bar_position_get(ctx->smanager, &posx, &posy);
211 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.horizontal_bar", posx, 0.0); 211 edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.horizontal_bar", posx, 0.0);
212 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vertical_bar", 0.0, posy); 212 edje_object_part_drag_value_set(wd->resize_obj, "efl.draggable.vertical_bar", 0.0, posy);
213 if (ctx->scroll_count) 213 if (ctx->scroll_count)
214 ctx->need_scroll = EINA_TRUE; 214 ctx->need_scroll = EINA_TRUE;
215 else 215 else
@@ -257,33 +257,33 @@ efl_ui_scroll_connector_bind(Eo *obj, Eo *manager)
257 //from the theme to the object 257 //from the theme to the object
258 efl_layout_signal_callback_add(obj, "reload", "efl", 258 efl_layout_signal_callback_add(obj, "reload", "efl",
259 ctx, _scroll_connector_reload_cb, NULL); 259 ctx, _scroll_connector_reload_cb, NULL);
260 efl_layout_signal_callback_add(obj, "drag", "efl.dragable.vertical_bar", 260 efl_layout_signal_callback_add(obj, "drag", "efl.draggable.vertical_bar",
261 ctx, _scroll_connector_vbar_drag_cb, NULL); 261 ctx, _scroll_connector_vbar_drag_cb, NULL);
262 efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.vertical_bar", 262 efl_layout_signal_callback_add(obj, "drag,set", "efl.draggable.vertical_bar",
263 ctx, _scroll_connector_edje_drag_cb, NULL); 263 ctx, _scroll_connector_edje_drag_cb, NULL);
264 efl_layout_signal_callback_add(obj, "drag,start", "efl.dragable.vertical_bar", 264 efl_layout_signal_callback_add(obj, "drag,start", "efl.draggable.vertical_bar",
265 ctx, _scroll_connector_edje_drag_start_cb, NULL); 265 ctx, _scroll_connector_edje_drag_start_cb, NULL);
266 efl_layout_signal_callback_add(obj, "drag,stop", "efl.dragable.vertical_bar", 266 efl_layout_signal_callback_add(obj, "drag,stop", "efl.draggable.vertical_bar",
267 ctx, _scroll_connector_edje_drag_stop_cb, NULL); 267 ctx, _scroll_connector_edje_drag_stop_cb, NULL);
268 efl_layout_signal_callback_add(obj, "drag,step", "efl.dragable.vertical_bar", 268 efl_layout_signal_callback_add(obj, "drag,step", "efl.draggable.vertical_bar",
269 ctx, _scroll_connector_edje_drag_cb, NULL); 269 ctx, _scroll_connector_edje_drag_cb, NULL);
270 efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.vertical_bar", 270 efl_layout_signal_callback_add(obj, "drag,page", "efl.draggable.vertical_bar",
271 ctx, _scroll_connector_edje_drag_cb, NULL); 271 ctx, _scroll_connector_edje_drag_cb, NULL);
272 efl_layout_signal_callback_add(obj, "efl,vertical_bar,press", "efl", 272 efl_layout_signal_callback_add(obj, "efl,vertical_bar,press", "efl",
273 ctx, _scroll_connector_vbar_press_cb, NULL); 273 ctx, _scroll_connector_vbar_press_cb, NULL);
274 efl_layout_signal_callback_add(obj, "efl,vbar,unpress", "efl", 274 efl_layout_signal_callback_add(obj, "efl,vbar,unpress", "efl",
275 ctx, _scroll_connector_vbar_unpress_cb, NULL); 275 ctx, _scroll_connector_vbar_unpress_cb, NULL);
276 efl_layout_signal_callback_add(obj, "drag", "efl.dragable.horizontal_bar", 276 efl_layout_signal_callback_add(obj, "drag", "efl.draggable.horizontal_bar",
277 ctx, _scroll_connector_hbar_drag_cb, NULL); 277 ctx, _scroll_connector_hbar_drag_cb, NULL);
278 efl_layout_signal_callback_add(obj, "drag,set", "efl.dragable.horizontal_bar", 278 efl_layout_signal_callback_add(obj, "drag,set", "efl.draggable.horizontal_bar",
279 ctx, _scroll_connector_edje_drag_cb, NULL); 279 ctx, _scroll_connector_edje_drag_cb, NULL);
280 efl_layout_signal_callback_add(obj, "drag,start", "efl.dragable.horizontal_bar", 280 efl_layout_signal_callback_add(obj, "drag,start", "efl.draggable.horizontal_bar",
281 ctx, _scroll_connector_edje_drag_start_cb, NULL); 281 ctx, _scroll_connector_edje_drag_start_cb, NULL);
282 efl_layout_signal_callback_add(obj, "drag,stop", "efl.dragable.horizontal_bar", 282 efl_layout_signal_callback_add(obj, "drag,stop", "efl.draggable.horizontal_bar",
283 ctx, _scroll_connector_edje_drag_stop_cb, NULL); 283 ctx, _scroll_connector_edje_drag_stop_cb, NULL);
284 efl_layout_signal_callback_add(obj, "drag,step", "efl.dragable.horizontal_bar", 284 efl_layout_signal_callback_add(obj, "drag,step", "efl.draggable.horizontal_bar",
285 ctx, _scroll_connector_edje_drag_cb, NULL); 285 ctx, _scroll_connector_edje_drag_cb, NULL);
286 efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.horizontal_bar", 286 efl_layout_signal_callback_add(obj, "drag,page", "efl.draggable.horizontal_bar",
287 ctx, _scroll_connector_edje_drag_cb, NULL); 287 ctx, _scroll_connector_edje_drag_cb, NULL);
288 efl_layout_signal_callback_add(obj, "efl,horizontal_bar,press", "efl", 288 efl_layout_signal_callback_add(obj, "efl,horizontal_bar,press", "efl",
289 ctx, _scroll_connector_hbar_press_cb, NULL); 289 ctx, _scroll_connector_hbar_press_cb, NULL);
@@ -313,34 +313,34 @@ efl_ui_scroll_connector_unbind(Eo *obj)
313 313
314 efl_layout_signal_callback_del(obj, "reload", "efl", 314 efl_layout_signal_callback_del(obj, "reload", "efl",
315 ctx, _scroll_connector_reload_cb, NULL); 315 ctx, _scroll_connector_reload_cb, NULL);
316 efl_layout_signal_callback_del(obj, "drag", "efl.dragable.vertical_bar", 316 efl_layout_signal_callback_del(obj, "drag", "efl.draggable.vertical_bar",
317 ctx, _scroll_connector_vbar_drag_cb, NULL); 317 ctx, _scroll_connector_vbar_drag_cb, NULL);
318 efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.vertical_bar", 318 efl_layout_signal_callback_del(obj, "drag,set", "efl.draggable.vertical_bar",
319 ctx, _scroll_connector_edje_drag_cb, NULL); 319 ctx, _scroll_connector_edje_drag_cb, NULL);
320 efl_layout_signal_callback_del(obj, "drag,start", "efl.dragable.vertical_bar", 320 efl_layout_signal_callback_del(obj, "drag,start", "efl.draggable.vertical_bar",
321 ctx, _scroll_connector_edje_drag_start_cb, NULL); 321 ctx, _scroll_connector_edje_drag_start_cb, NULL);
322 efl_layout_signal_callback_del(obj, "drag,stop", "efl.dragable.vertical_bar", 322 efl_layout_signal_callback_del(obj, "drag,stop", "efl.draggable.vertical_bar",
323 ctx, _scroll_connector_edje_drag_stop_cb, NULL); 323 ctx, _scroll_connector_edje_drag_stop_cb, NULL);
324 efl_layout_signal_callback_del(obj, "drag,step", "efl.dragable.vertical_bar", 324 efl_layout_signal_callback_del(obj, "drag,step", "efl.draggable.vertical_bar",
325 ctx, _scroll_connector_edje_drag_cb, NULL); 325 ctx, _scroll_connector_edje_drag_cb, NULL);
326 efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.vertical_bar", 326 efl_layout_signal_callback_del(obj, "drag,page", "efl.draggable.vertical_bar",
327 ctx, _scroll_connector_edje_drag_cb, NULL); 327 ctx, _scroll_connector_edje_drag_cb, NULL);
328 efl_layout_signal_callback_del(obj, "efl,vertical_bar,press", "efl", 328 efl_layout_signal_callback_del(obj, "efl,vertical_bar,press", "efl",
329 ctx, _scroll_connector_vbar_press_cb, NULL); 329 ctx, _scroll_connector_vbar_press_cb, NULL);
330 efl_layout_signal_callback_del(obj, "efl,vbar,unpress", "efl", 330 efl_layout_signal_callback_del(obj, "efl,vbar,unpress", "efl",
331 ctx, _scroll_connector_vbar_unpress_cb, NULL); 331 ctx, _scroll_connector_vbar_unpress_cb, NULL);
332 332
333 efl_layout_signal_callback_del(obj, "drag", "efl.dragable.horizontal_bar", 333 efl_layout_signal_callback_del(obj, "drag", "efl.draggable.horizontal_bar",
334 ctx, _scroll_connector_hbar_drag_cb, NULL); 334 ctx, _scroll_connector_hbar_drag_cb, NULL);
335 efl_layout_signal_callback_del(obj, "drag,set", "efl.dragable.horizontal_bar", 335 efl_layout_signal_callback_del(obj, "drag,set", "efl.draggable.horizontal_bar",
336 ctx, _scroll_connector_edje_drag_cb, NULL); 336 ctx, _scroll_connector_edje_drag_cb, NULL);
337 efl_layout_signal_callback_del(obj, "drag,start", "efl.dragable.horizontal_bar", 337 efl_layout_signal_callback_del(obj, "drag,start", "efl.draggable.horizontal_bar",
338 ctx, _scroll_connector_edje_drag_start_cb, NULL); 338 ctx, _scroll_connector_edje_drag_start_cb, NULL);
339 efl_layout_signal_callback_del(obj, "drag,stop", "efl.dragable.horizontal_bar", 339 efl_layout_signal_callback_del(obj, "drag,stop", "efl.draggable.horizontal_bar",
340 ctx, _scroll_connector_edje_drag_stop_cb, NULL); 340 ctx, _scroll_connector_edje_drag_stop_cb, NULL);
341 efl_layout_signal_callback_del(obj, "drag,step", "efl.dragable.horizontal_bar", 341 efl_layout_signal_callback_del(obj, "drag,step", "efl.draggable.horizontal_bar",
342 ctx, _scroll_connector_edje_drag_cb, NULL); 342 ctx, _scroll_connector_edje_drag_cb, NULL);
343 efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.horizontal_bar", 343 efl_layout_signal_callback_del(obj, "drag,page", "efl.draggable.horizontal_bar",
344 ctx, _scroll_connector_edje_drag_cb, NULL); 344 ctx, _scroll_connector_edje_drag_cb, NULL);
345 efl_layout_signal_callback_del(obj, "efl,horizontal_bar,press", "efl", 345 efl_layout_signal_callback_del(obj, "efl,horizontal_bar,press", "efl",
346 ctx, _scroll_connector_hbar_press_cb, NULL); 346 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)
85 85
86 double posx = 0.0, posy = 0.0, pos = 0.0, val; 86 double posx = 0.0, posy = 0.0, pos = 0.0, val;
87 87
88 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"), 88 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable.slider"),
89 &posx, &posy); 89 &posx, &posy);
90 if (_is_horizontal(sd->dir)) pos = posx; 90 if (_is_horizontal(sd->dir)) pos = posx;
91 else pos = posy; 91 else pos = posy;
@@ -129,7 +129,7 @@ _drag_value_update(Evas_Object *obj)
129 pos = 1.0 - pos; 129 pos = 1.0 - pos;
130 } 130 }
131 131
132 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 132 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
133 pos, pos); 133 pos, pos);
134 134
135 evas_object_smart_changed(obj); 135 evas_object_smart_changed(obj);
@@ -192,7 +192,7 @@ _drag_up(Evas_Object *obj)
192 192
193 relative_step = step/(sd->val_max - sd->val_min); 193 relative_step = step/(sd->val_max - sd->val_min);
194 194
195 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"), 195 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
196 relative_step, relative_step); 196 relative_step, relative_step);
197 _drag_value_fetch(obj); 197 _drag_value_fetch(obj);
198} 198}
@@ -212,7 +212,7 @@ _drag_down(Evas_Object *obj)
212 212
213 relative_step = step/(sd->val_max - sd->val_min); 213 relative_step = step/(sd->val_max - sd->val_min);
214 214
215 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"), 215 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
216 relative_step, relative_step); 216 relative_step, relative_step);
217 _drag_value_fetch(obj); 217 _drag_value_fetch(obj);
218} 218}
@@ -445,7 +445,7 @@ _spacer_down_cb(void *data,
445 if (button_y < 0) button_y = 0; 445 if (button_y < 0) button_y = 0;
446 } 446 }
447 447
448 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 448 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
449 button_x, button_y); 449 button_x, button_y);
450 450
451 if (!efl_ui_focus_object_focus_get(data)) 451 if (!efl_ui_focus_object_focus_get(data))
@@ -511,7 +511,7 @@ _spacer_move_cb(void *data,
511 if (button_y < 0) button_y = 0; 511 if (button_y < 0) button_y = 0;
512 } 512 }
513 513
514 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 514 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
515 button_x, button_y); 515 button_x, button_y);
516 _drag_value_fetch(data); 516 _drag_value_fetch(data);
517 } 517 }
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)
82 else if (pos2 > 1.0) 82 else if (pos2 > 1.0)
83 pos2 = 1.0; 83 pos2 = 1.0;
84 84
85 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 85 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
86 pos, pos); 86 pos, pos);
87 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"), 87 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
88 pos2, pos2); 88 pos2, pos2);
89 89
90 // emit accessibility event also if value was changed by API 90 // emit accessibility event also if value was changed by API
@@ -103,12 +103,12 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
103 EFL_UI_SLIDER_INTERVAL_DATA_GET(obj, sd); 103 EFL_UI_SLIDER_INTERVAL_DATA_GET(obj, sd);
104 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 104 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
105 105
106 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"), 106 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable.slider"),
107 &posx, &posy); 107 &posx, &posy);
108 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos = posx; 108 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos = posx;
109 else pos = posy; 109 else pos = posy;
110 110
111 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"), 111 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable2.slider"),
112 &posx2, &posy2); 112 &posx2, &posy2);
113 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2; 113 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2;
114 else pos2 = posy2; 114 else pos2 = posy2;
@@ -163,9 +163,9 @@ _down_knob(Evas_Object *obj, double button_x, double button_y)
163 163
164 sd->intvl_flag = 0; 164 sd->intvl_flag = 0;
165 165
166 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"), 166 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable.slider"),
167 &posx, &posy); 167 &posx, &posy);
168 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"), 168 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.draggable2.slider"),
169 &posx2, &posy2); 169 &posx2, &posy2);
170 170
171 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) 171 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)
183 183
184 if (diff1 < diff2) 184 if (diff1 < diff2)
185 { 185 {
186 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 186 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
187 button_x, button_y); 187 button_x, button_y);
188 sd->intvl_flag = 1; 188 sd->intvl_flag = 1;
189 } 189 }
190 else if (diff1 > diff2) 190 else if (diff1 > diff2)
191 { 191 {
192 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"), 192 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
193 button_x, button_y); 193 button_x, button_y);
194 sd->intvl_flag = 2; 194 sd->intvl_flag = 2;
195 } 195 }
@@ -197,13 +197,13 @@ _down_knob(Evas_Object *obj, double button_x, double button_y)
197 { 197 {
198 if (diff3 < 0) 198 if (diff3 < 0)
199 { 199 {
200 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 200 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
201 button_x, button_y); 201 button_x, button_y);
202 sd->intvl_flag = 1; 202 sd->intvl_flag = 1;
203 } 203 }
204 else 204 else
205 { 205 {
206 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"), 206 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
207 button_x, button_y); 207 button_x, button_y);
208 sd->intvl_flag = 2; 208 sd->intvl_flag = 2;
209 } 209 }
@@ -218,12 +218,12 @@ _move_knob(Evas_Object *obj, double button_x, double button_y)
218 218
219 if (sd->intvl_flag == 1) 219 if (sd->intvl_flag == 1)
220 { 220 {
221 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"), 221 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable.slider"),
222 button_x, button_y); 222 button_x, button_y);
223 } 223 }
224 else if (sd->intvl_flag == 2) 224 else if (sd->intvl_flag == 2)
225 { 225 {
226 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"), 226 efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.draggable2.slider"),
227 button_x, button_y); 227 button_x, button_y);
228 } 228 }
229} 229}
@@ -640,7 +640,7 @@ _drag_up(Evas_Object *obj)
640 640
641 relative_step = step/(sd->val_max - sd->val_min); 641 relative_step = step/(sd->val_max - sd->val_min);
642 642
643 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"), 643 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
644 relative_step, relative_step); 644 relative_step, relative_step);
645 _slider_update(obj, EINA_TRUE); 645 _slider_update(obj, EINA_TRUE);
646} 646}
@@ -659,7 +659,7 @@ _drag_down(Evas_Object *obj)
659 659
660 relative_step = step/(sd->val_max - sd->val_min); 660 relative_step = step/(sd->val_max - sd->val_min);
661 661
662 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"), 662 efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.draggable.slider"),
663 relative_step, relative_step); 663 relative_step, relative_step);
664 _slider_update(obj, EINA_TRUE); 664 _slider_update(obj, EINA_TRUE);
665} 665}
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);
77 77
78static const char iface_scr_legacy_dragable_hbar[] = "elm.dragable.hbar"; 78static const char iface_scr_legacy_dragable_hbar[] = "elm.dragable.hbar";
79static const char iface_scr_legacy_dragable_vbar[] = "elm.dragable.vbar"; 79static const char iface_scr_legacy_dragable_vbar[] = "elm.dragable.vbar";
80static const char iface_scr_efl_ui_dragable_hbar[] = "efl.dragable.horizontal_bar"; 80static const char iface_scr_efl_ui_dragable_hbar[] = "efl.draggable.horizontal_bar";
81static const char iface_scr_efl_ui_dragable_vbar[] = "efl.dragable.vertical_bar"; 81static const char iface_scr_efl_ui_dragable_vbar[] = "efl.draggable.vertical_bar";
82 82
83static double 83static double
84_round(double value, int pos) 84_round(double value, int pos)