raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=4b1f3c4e4424fa73c2e66bee12eab6cf35c3a000
commit 4b1f3c4e4424fa73c2e66bee12eab6cf35c3a000 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Oct 26 14:18:28 2019 +0100 TH - scroller - remove unused script --- data/elementary/themes/edc/elm/scroller.edc | 154 ++++------------------------ 1 file changed, 20 insertions(+), 134 deletions(-) diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc index 83a8506b80..95278b5142 100644 --- a/data/elementary/themes/edc/elm/scroller.edc +++ b/data/elementary/themes/edc/elm/scroller.edc @@ -12,74 +12,10 @@ group { name: "elm/scroller/base/default"; data.item: "focus_highlight" "on"; - script { - public loop_x, loop_y; - - public action_on_pos_vbar(val) { - new x, y , w, h, x1, y1 , w1, h1; - - get_geometry(PART:"y_vbar_up", x, y, w, h); - get_geometry(PART:"y_vbar_up_mapper", x1, y1, w1, h1); - - if (((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y))) { -// set_state(PART:"arrow1_vbar", "hidden", 0.0); -// set_state(PART:"sb_vbar_a1", "hidden", 0.0); - } else { -// set_state(PART:"arrow1_vbar", "default", 0.0); -// set_state(PART:"sb_vbar_a1", "default", 0.0); - } - - get_geometry(PART:"y_vbar_down", x,y,w, h); - get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1); - - if (((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y))) { -// set_state(PART:"arrow2_vbar", "hidden", 0.0); -// set_state(PART:"sb_vbar_a2", "hidden", 0.0); - } else { -// set_state(PART:"arrow2_vbar", "default", 0.0); -// set_state(PART:"sb_vbar_a2", "default", 0.0); - } - - if (val < 10) - timer(0.1,"action_on_pos_vbar", val+1); - } - - public action_on_pos_hbar(val) { - new x, y , w, h, x1, y1 , w1, h1; - - get_geometry(PART:"x_hbar_left", x,y,w, h); - get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1); - - if (((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x))) { -// set_state(PART:"arrow1_hbar", "hidden", 0.0); -// set_state(PART:"sb_hbar_a1", "hidden", 0.0); - } else { -// set_state(PART:"arrow1_hbar", "default", 0.0); -// set_state(PART:"sb_hbar_a1", "default", 0.0); - } - - get_geometry(PART:"x_hbar_right", x,y,w, h); - get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1); - - if (((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x))) { -// set_state(PART:"arrow2_hbar", "hidden", 0.0); -// set_state(PART:"sb_hbar_a2", "hidden", 0.0); - } else { -// set_state(PART:"arrow2_hbar", "default", 0.0); -// set_state(PART:"sb_hbar_a2", "default", 0.0); - } - - if (val < 10) - timer(0.1,"action_on_pos_hbar", val+1); - } - } - parts { program { signal: "load"; source: ""; script { emit("reload", "elm"); - action_on_pos_vbar(0); - action_on_pos_hbar(0); } } @@ -412,8 +348,7 @@ group { name: "elm/scroller/base/default"; max: 0 0; } } - program { - signal: "elm,action,show,vbar"; source: "elm"; + program { signal: "elm,action,show,vbar"; source: "elm"; action: STATE_SET "default" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -422,10 +357,8 @@ group { name: "elm/scroller/base/default"; target: "y_vbar_up"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; - after: "check_pos_vbar"; } - program { - signal: "elm,action,hide,vbar"; source: "elm"; + program { signal: "elm,action,hide,vbar"; source: "elm"; action: STATE_SET "hidden" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -435,41 +368,20 @@ group { name: "elm/scroller/base/default"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; } - program { - signal: "mouse,down,1*"; source: "sb_vbar_p1"; + program { signal: "mouse,down,1*"; source: "sb_vbar_p1"; action: DRAG_VAL_PAGE 0.0 -1.0; target: "elm.dragable.vbar"; } - program { - signal: "mouse,down,1*"; source: "sb_vbar_p2"; + program { signal: "mouse,down,1*"; source: "sb_vbar_p2"; action: DRAG_VAL_PAGE 0.0 1.0; target: "elm.dragable.vbar"; } - program { - signal: "elm,action,scroll"; source: "elm"; - script { - action_on_pos_vbar(10); - } - } - program { name: "check_pos_vbar"; - script { - action_on_pos_vbar(10); - } - } - program { name: "loop_set_vbar"; - signal: "elm,loop_y,set"; source: "elm"; - script { - set_int(loop_y, 1); - action_on_pos_vbar(10); - } - } - program { name: "loop_unset_vbar"; - signal: "elm,loop_y,unset"; source: "elm"; - script { - set_int(loop_y, 0); - action_on_pos_vbar(10); - } - } +// program { signal: "elm,action,scroll"; source: "elm"; +// } +// program { signal: "elm,loop_y,set"; source: "elm"; +// } +// program { signal: "elm,loop_y,unset"; source: "elm"; +// } // horiz bar ///////////////////////////////////////////////////////////// part { name: "sb_hbar_show"; type: RECT; @@ -630,8 +542,7 @@ group { name: "elm/scroller/base/default"; max: 0 0; } } - program { - signal: "elm,action,show,hbar"; source: "elm"; + program { signal: "elm,action,show,hbar"; source: "elm"; action: STATE_SET "default" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; @@ -640,10 +551,8 @@ group { name: "elm/scroller/base/default"; target: "x_hbar_left"; target: "x_hbar_right_mapper"; target: "x_hbar_right"; - after: "check_pos_hbar"; } - program { - signal: "elm,action,hide,hbar"; source: "elm"; + program { signal: "elm,action,hide,hbar"; source: "elm"; action: STATE_SET "hidden" 0.0; target: "sb_hbar"; target: "sb_hbar_show"; @@ -653,43 +562,20 @@ group { name: "elm/scroller/base/default"; target: "x_hbar_right_mapper"; target: "x_hbar_right"; } - program { - signal: "mouse,down,1*"; source: "sb_hbar_p1"; + program { signal: "mouse,down,1*"; source: "sb_hbar_p1"; action: DRAG_VAL_PAGE -1.0 0.0; target: "elm.dragable.hbar"; - after: "check_pos_hbar"; } - program { - signal: "mouse,down,1*"; source: "sb_hbar_p2"; + program { signal: "mouse,down,1*"; source: "sb_hbar_p2"; action: DRAG_VAL_PAGE 1.0 0.0; target: "elm.dragable.hbar"; - after: "check_pos_hbar"; - } - program { - signal: "elm,action,scroll"; source: "elm"; - script { - action_on_pos_hbar(10); - } - } - program { name: "check_pos_hbar"; - script { - action_on_pos_hbar(10); - } - } - program { name: "loop_set_hbar"; - signal: "elm,loop_x,set"; source: "elm"; - script { - set_int(loop_x, 1); - action_on_pos_hbar(10); - } - } - program { name: "loop_unset_hbar"; - signal: "elm,loop_x,unset"; source: "elm"; - script { - set_int(loop_x, 0); - action_on_pos_hbar(10); - } } +// program { signal: "elm,action,scroll"; source: "elm"; +// } +// program { signal: "elm,loop_x,set"; source: "elm"; +// } +// program { signal: "elm,loop_x,unset"; source: "elm"; +// } ////////////////////////////////////////////////////////////////////// part { name: "color_vbar"; type: RECT; mouse_events: 0; --