raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=ec8682e4cf9136fe446d5041b5f952585fb5dd97
commit ec8682e4cf9136fe446d5041b5f952585fb5dd97
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Mar 9 20:30:00 2018 +0900
TH - e scrollframe - match elm scroller
---
data/elementary/themes/edc/elm/scroller.edc | 1 -
data/elementary/themes/edc/scrollframe.edc | 829 +++++++++++++---------------
2 files changed, 375 insertions(+), 455 deletions(-)
diff --git a/data/elementary/themes/edc/elm/scroller.edc
b/data/elementary/themes/edc/elm/scroller.edc
index 671c5160de..83a8506b80 100644
--- a/data/elementary/themes/edc/elm/scroller.edc
+++ b/data/elementary/themes/edc/elm/scroller.edc
@@ -87,7 +87,6 @@ group { name: "elm/scroller/base/default";
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "elm.swallow.background";
-// color: 64 64 64 200;
color: 0 0 0 0;
color_class: "scroller_bg";
}
diff --git a/data/elementary/themes/edc/scrollframe.edc
b/data/elementary/themes/edc/scrollframe.edc
index e7f9db1bef..e740340433 100644
--- a/data/elementary/themes/edc/scrollframe.edc
+++ b/data/elementary/themes/edc/scrollframe.edc
@@ -1,31 +1,92 @@
group { name: "e/widgets/scrollframe";
- images.image: "bevel_out.png" COMP;
- images.image: "runner_horiz.png" COMP;
- images.image: "runner_vert.png" COMP;
- images.image: "runner_glow_horiz.png" COMP;
- images.image: "runner_glow_vert.png" COMP;
- images.image: "holes_tiny_horiz.png" COMP;
- images.image: "holes_tiny_vert.png" COMP;
- images.image: "holes_tiny_glow_horiz.png" COMP;
- images.image: "holes_tiny_glow_vert.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "glow_small.png" COMP;
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "sym_up_glow_normal.png" COMP;
- images.image: "sym_down_glow_normal.png" COMP;
+
+ 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 {
+ //////////////////////////////////////////////////////////////////////
+ part { name: "bg"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "e.swallow.content";
+ color: 0 0 0 0;
+ color_class: "scroller_bg";
+ }
+ }
+ part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "e.swallow.content";
+ }
+ }
+ part { name: "e.swallow.content"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ }
+ }
+
+ //////////////////////////////////////////////////////////////////////
+
// vert bar ////////////////////////////////////////////////////////////////
part { name: "sb_vbar_show"; type: RECT;
- scale: 1;
description { state: "default" 0.0;
- rel1.offset: -11 -11;
- rel2.offset: 10 10;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -35,7 +96,8 @@ group { name: "e/widgets/scrollframe";
part { name: "sb_vbar"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 15 15;
+ fixed: 1 1;
+ min: 15 1;
align: 1.0 0.0;
rel1.relative: 1.0 0.0;
rel1.offset: -1 0;
@@ -45,27 +107,17 @@ group { name: "e/widgets/scrollframe";
description { state: "hidden" 0.0;
inherit: "default" 0.0;
min: 0 0;
- max: 0 99999;
- }
- }
- part { name: "sb_vbar_base"; type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1.relative: 0.0 1.0;
- rel1.to: "sb_vbar_a1";
- rel2.relative: 1.0 0.0;
- rel2.to: "sb_vbar_a2";
+ max: 0 999999;
}
}
part { name: "sb_vbar_p1"; type: RECT;
clip_to: "sb_vbar";
description { state: "default" 0.0;
color: 0 0 0 0;
- rel1.relative: 0.0 1.0;
- rel1.to: "sb_vbar_a1";
+ rel1.to: "sb_vbar";
rel2.relative: 1.0 0.0;
rel2.to: "e.dragable.vbar";
+ fixed: 1 1;
}
}
part { name: "sb_vbar_p2"; type: RECT;
@@ -74,8 +126,8 @@ group { name: "e/widgets/scrollframe";
color: 0 0 0 0;
rel1.relative: 0.0 1.0;
rel1.to: "e.dragable.vbar";
- rel2.relative: 1.0 0.0;
- rel2.to: "sb_vbar_a2";
+ rel2.to: "sb_vbar";
+ fixed: 1 1;
}
}
part { name: "e.dragable.vbar"; type: RECT;
@@ -83,87 +135,136 @@ group { name: "e/widgets/scrollframe";
scale: 1;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
- dragable.confine: "sb_vbar_base";
+ dragable.confine: "sb_vbar";
description { state: "default" 0.0;
+ fixed: 1 1;
min: 15 15;
rel1.relative: 0.5 0.5;
- rel1.to: "sb_vbar_base";
+ rel1.to: "sb_vbar";
rel2.relative: 0.5 0.5;
- rel2.to: "sb_vbar_base";
+ rel2.to: "sb_vbar";
color: 0 0 0 0;
}
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ }
}
- part { name: "sb_vbar_a1"; type: RECT;
- clip_to: "sb_vbar";
+ part { name: "sb_vbar_over"; type: RECT;
+ repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- align: 0.5 0.0;
- aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
color: 0 0 0 0;
rel1.to: "sb_vbar";
+ rel1.offset: -45 0;
rel2.to: "sb_vbar";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 0;
+ fixed: 1 1;
+ offscale;
}
}
- part { name: "sb_vbar_a2"; type: RECT;
- clip_to: "sb_vbar";
+ program { signal: "mouse,in"; source: "sb_vbar_over";
+ action: STATE_SET "over" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_vbar";
+ }
+ program { signal: "mouse,out"; source: "sb_vbar_over";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_vbar";
+ }
+ part { name: "y_vbar_up_mapper"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
description { state: "default" 0.0;
- min: 15 15;
- align: 0.5 1.0;
- aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
- color: 0 0 0 0;
+ min: 4 2;
+ max: 4 2;
+ fixed: 1 1;
+ align: 0.0 0.0;
rel1.to: "sb_vbar";
- rel1.offset: 0 -1;
- rel1.relative: 0.0 1.0;
rel2.to: "sb_vbar";
}
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
+ }
+ part { name: "y_vbar_up"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 4 2;
+ max: 4 2;
+ fixed: 1 1;
+ align: 0.0 0.0;
+ rel1.to: "e.dragable.vbar";
+ rel2.to: "e.dragable.vbar";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
+ }
+ part { name: "y_vbar_down_mapper"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 4 2;
+ max: 4 2;
+ fixed: 1 1;
+ align: 0.0 1.0;
+ rel1.to: "sb_vbar";
+ rel2.to: "sb_vbar";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
+ }
+ part { name: "y_vbar_down"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 4 2;
+ max: 4 2;
+ fixed: 1 1;
+ align: 0.0 1.0;
+ rel1.to: "e.dragable.vbar";
+ rel2.to: "e.dragable.vbar";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
}
program {
signal: "e,action,show,vbar"; source: "e";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
+ target: "e.dragable.vbar";
+ target: "y_vbar_up_mapper";
+ target: "y_vbar_up";
+ target: "y_vbar_down_mapper";
+ target: "y_vbar_down";
+ after: "check_pos_vbar";
}
program {
signal: "e,action,hide,vbar"; source: "e";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_a1";
- action: STATE_SET "clicked" 0.0;
- target: "sb_vbar_a1";
- target: "arrow1_vbar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_a1";
- action: DRAG_VAL_STEP 0.0 -1.0;
- target: "e.dragable.vbar";
- }
- program {
- signal: "mouse,up,1"; source: "sb_vbar_a1";
- action: STATE_SET "default" 0.0;
- target: "sb_vbar_a1";
- target: "arrow1_vbar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_a2";
- action: STATE_SET "clicked" 0.0;
- target: "sb_vbar_a2";
- target: "arrow2_vbar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_a2";
- action: DRAG_VAL_STEP 0.0 1.0;
target: "e.dragable.vbar";
- }
- program {
- signal: "mouse,up,1"; source: "sb_vbar_a2";
- action: STATE_SET "default" 0.0;
- target: "sb_vbar_a2";
- target: "arrow2_vbar";
+ target: "y_vbar_up_mapper";
+ target: "y_vbar_up";
+ target: "y_vbar_down_mapper";
+ target: "y_vbar_down";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p1";
@@ -175,13 +276,15 @@ group { name: "e/widgets/scrollframe";
action: DRAG_VAL_PAGE 0.0 1.0;
target: "e.dragable.vbar";
}
+ program { name: "check_pos_vbar";
+ script {
+ action_on_pos_vbar(10);
+ }
+ }
// horiz bar /////////////////////////////////////////////////////////////
part { name: "sb_hbar_show"; type: RECT;
- scale: 1;
description { state: "default" 0.0;
- rel1.offset: -11 -11;
- rel2.offset: 10 10;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -191,7 +294,8 @@ group { name: "e/widgets/scrollframe";
part { name: "sb_hbar"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: 15 15;
+ fixed: 1 1;
+ min: 1 15;
align: 0.0 1.0;
rel1.relative: 0.0 1.0;
rel1.offset: 0 -1;
@@ -201,27 +305,17 @@ group { name: "e/widgets/scrollframe";
description { state: "hidden" 0.0;
inherit: "default" 0.0;
min: 0 0;
- max: 99999 0;
- }
- }
- part { name: "sb_hbar_base"; type: RECT;
- clip_to: "sb_hbar";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1.relative: 1.0 0.0;
- rel1.to: "sb_hbar_a1";
- rel2.relative: 0.0 1.0;
- rel2.to: "sb_hbar_a2";
+ max: 999999 0;
}
}
part { name: "sb_hbar_p1"; type: RECT;
clip_to: "sb_hbar";
description { state: "default" 0.0;
color: 0 0 0 0;
- rel1.relative: 1.0 0.0;
- rel1.to: "sb_hbar_a1";
+ rel1.to: "sb_hbar";
rel2.relative: 0.0 1.0;
rel2.to: "e.dragable.hbar";
+ fixed: 1 1;
}
}
part { name: "sb_hbar_p2"; type: RECT;
@@ -230,422 +324,240 @@ group { name: "e/widgets/scrollframe";
color: 0 0 0 0;
rel1.relative: 1.0 0.0;
rel1.to: "e.dragable.hbar";
- rel2.relative: 0.0 1.0;
- rel2.to: "sb_hbar_a2";
+ rel2.to: "sb_hbar";
+ fixed: 1 1;
}
}
part { name: "e.dragable.hbar"; type: RECT;
- clip_to: "sb_hbar";
scale: 1;
+ clip_to: "sb_hbar";
dragable.x: 1 1 0;
dragable.y: 0 0 0;
- dragable.confine: "sb_hbar_base";
+ dragable.confine: "sb_hbar";
description { state: "default" 0.0;
+ fixed: 1 1;
min: 15 15;
rel1.relative: 0.5 0.5;
- rel1.to: "sb_hbar_base";
+ rel1.to: "sb_hbar";
rel2.relative: 0.5 0.5;
- rel2.to: "sb_hbar_base";
+ rel2.to: "sb_hbar";
color: 0 0 0 0;
}
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ }
}
- part { name: "sb_hbar_a1"; type: RECT;
- clip_to: "sb_hbar";
+ part { name: "sb_hbar_over"; type: RECT;
+ repeat_events: 1;
+ scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- align: 0.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
color: 0 0 0 0;
rel1.to: "sb_hbar";
+ rel1.offset: 0 -45;
rel2.to: "sb_hbar";
- rel2.relative: 0.0 1.0;
- rel2.offset: 0 -1;
+ fixed: 1 1;
+ offscale;
}
}
- part { name: "sb_hbar_a2"; type: RECT;
- clip_to: "sb_hbar";
+ program { signal: "mouse,in"; source: "sb_hbar_over";
+ action: STATE_SET "over" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_hbar";
+ }
+ program { signal: "mouse,out"; source: "sb_hbar_over";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_hbar";
+ }
+ part { name: "x_hbar_left_mapper"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
description { state: "default" 0.0;
- min: 15 15;
- align: 1.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- color: 0 0 0 0;
+ min: 2 4;
+ max: 2 4;
+ fixed: 1 1;
+ align: 0.0 1.0;
rel1.to: "sb_hbar";
- rel1.offset: -1 0;
- rel1.relative: 1.0 0.0;
rel2.to: "sb_hbar";
}
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
+ }
+ part { name: "x_hbar_left"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 2 4;
+ max: 2 4;
+ fixed: 1 1;
+ align: 0.0 1.0;
+ rel1.to: "e.dragable.hbar";
+ rel2.to: "e.dragable.hbar";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
+ }
+ part { name: "x_hbar_right_mapper"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 2 4;
+ max: 2 4;
+ fixed: 1 1;
+ align: 1.0 1.0;
+ rel1.to: "sb_hbar";
+ rel2.to: "sb_hbar";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
+ }
+ part { name: "x_hbar_right"; type: SPACER;
+ scale: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 2 4;
+ max: 2 4;
+ fixed: 1 1;
+ align: 1.0 1.0;
+ rel1.to: "e.dragable.hbar";
+ rel2.to: "e.dragable.hbar";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
}
program {
signal: "e,action,show,hbar"; source: "e";
action: STATE_SET "default" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
+ target: "e.dragable.hbar";
+ target: "x_hbar_left_mapper";
+ target: "x_hbar_left";
+ target: "x_hbar_right_mapper";
+ target: "x_hbar_right";
+ after: "check_pos_hbar";
}
program {
signal: "e,action,hide,hbar"; source: "e";
action: STATE_SET "hidden" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_a1";
- action: STATE_SET "clicked" 0.0;
- target: "sb_hbar_a1";
- target: "arrow1_hbar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_a1";
- action: DRAG_VAL_STEP -1.0 0.0;
- target: "e.dragable.hbar";
- }
- program {
- signal: "mouse,up,1"; source: "sb_hbar_a1";
- action: STATE_SET "default" 0.0;
- target: "sb_hbar_a1";
- target: "arrow1_hbar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_a2";
- action: STATE_SET "clicked" 0.0;
- target: "sb_hbar_a2";
- target: "arrow2_hbar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_a2";
- action: DRAG_VAL_STEP 1.0 0.0;
target: "e.dragable.hbar";
- }
- program {
- signal: "mouse,up,1"; source: "sb_hbar_a2";
- action: STATE_SET "default" 0.0;
- target: "sb_hbar_a2";
- target: "arrow2_hbar";
+ target: "x_hbar_left_mapper";
+ target: "x_hbar_left";
+ target: "x_hbar_right_mapper";
+ target: "x_hbar_right";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0;
target: "e.dragable.hbar";
+ after: "check_pos_hbar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0;
target: "e.dragable.hbar";
+ after: "check_pos_hbar";
}
-
- part { name: "bg"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "e.swallow.content";
- rel2.to: "e.swallow.content";
- color: 64 64 64 255;
- color_class: "scroller_bg";
- }
- }
- part { name: "clipper"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "e.swallow.content";
- rel2.to: "e.swallow.content";
- }
- }
- part { name: "e.swallow.content"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.relative: 0.0 0.0;
- rel2.offset: -2 -2;
- rel2.to_x: "sb_vbar";
- rel2.to_y: "sb_hbar";
- }
- }
- part { name: "runner_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- image.normal: "runner_vert.png";
- image.border: 0 0 2 2;
- rel1.to: "sb_vbar_base";
- rel2.to: "sb_vbar_base";
- fill.smooth: 0;
- min: 3 4;
- max: 3 99999;
- }
- }
- part { name: "runner_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- image.normal: "runner_horiz.png";
- image.border: 2 2 0 0;
- rel1.to: "sb_hbar_base";
- rel2.to: "sb_hbar_base";
- fill.smooth: 0;
- min: 4 3;
- max: 99999 3;
- }
- }
- part { name: "runner_vbar_clip"; type: RECT;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- min: 1 1;
- max: 1 99999;
- rel1.to: "runner_vbar";
- rel1.offset: 0 1;
- rel2.to: "runner_vbar";
- rel2.offset: -1 -2;
- }
- }
- part { name: "runner_hbar_clip"; type: RECT;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- min: 1 1;
- max: 99999 1;
- rel1.to: "runner_hbar";
- rel1.offset: 1 0;
- rel2.to: "runner_hbar";
- rel2.offset: -2 -1;
+ program { name: "check_pos_hbar";
+ script {
+ action_on_pos_hbar(10);
}
}
- part { name: "arrow1_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "sb_vbar_a1";
- rel2.to: "sb_vbar_a1";
- image.normal: "sym_up_light_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_glow_normal.png";
- }
- }
- part { name: "arrow2_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "sb_vbar_a2";
- rel2.to: "sb_vbar_a2";
- image.normal: "sym_down_light_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_glow_normal.png";
- }
- }
- part { name: "shadow_vbar"; mouse_events: 0;
+ //////////////////////////////////////////////////////////////////////
+ part { name: "color_vbar"; type: RECT; mouse_events: 0;
clip_to: "sb_vbar_show";
description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base_vbar";
- rel2.offset: 2 4;
- rel2.to: "base_vbar";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
+ fixed: 1 1;
+ color: 51 153 255 255;
}
- description { state: "clicked" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
- rel1.offset: -2 -2;
- rel2.offset: 1 1;
- color: 255 255 255 128;
- }
- }
- part { name: "glow_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.offset: -3 -3;
- rel1.to: "base_vbar";
- rel2.offset: 2 2;
- rel2.to: "base_vbar";
- image.normal: "glow_small.png";
- image.border: 7 7 7 7;
- fill.smooth: 0;
- visible: 0;
+ color: 80 80 80 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "runner_glow_vbar"; mouse_events: 0;
- clip_to: "runner_vbar_clip";
- description { state: "default" 0.0;
- rel1.offset: 0 -30;
- rel1.to_x: "runner_vbar_clip";
- rel1.to_y: "base_vbar";
- rel2.offset: -1 29;
- rel2.to_x: "runner_vbar_clip";
- rel2.to_y: "base_vbar";
- image.normal: "runner_glow_vert.png";
- image.border: 0 0 33 33;
- }
- }
- part { name: "base_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.offset: 2 0;
- rel1.to: "e.dragable.vbar";
- rel2.offset: -3 -1;
- rel2.to: "e.dragable.vbar";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- min: 5 13;
- TILED_HORIZ(120)
- }
- }
- part { name: "bevel_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_vbar";
- rel2.to: "base_vbar";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- min: 5 5;
- }
- }
- part { name: "center_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_vbar";
- rel2.to: "base_vbar";
- image.normal: "holes_tiny_vert.png";
- FIXED_SIZE(3, 11)
+ color: 255 255 255 255;
}
}
- part { name: "center_glow_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
+
+ part { name: "base_vbar"; type: RECT; mouse_events: 0;
+ scale: 1;
+ clip_to: "color_vbar";
description { state: "default" 0.0;
- rel1.to: "center_vbar";
- rel2.to: "center_vbar";
- image.normal: "holes_tiny_glow_vert.png";
- FIXED_SIZE(11, 17)
- visible: 0;
+ fixed: 1 1;
+ rel.to: "e.dragable.vbar";
+ min: 5 15;
+ max: 5 999999;
+ align: 1.0 0.5;
}
- description { state: "clicked" 0.0;
+ description { state: "over" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ min: 15 15;
+ max: 15 999999;
}
}
- part { name: "arrow1_hbar"; mouse_events: 0;
+ //////////////////////////////////////////////////////////////////////
+ part { name: "color_hbar"; type: RECT; mouse_events: 0;
clip_to: "sb_hbar_show";
description { state: "default" 0.0;
- rel1.to: "sb_hbar_a1";
- rel2.to: "sb_hbar_a1";
- image.normal: "sym_left_light_normal.png";
- FIXED_SIZE(15, 15)
+ fixed: 1 1;
+ color: 51 153 255 255;
}
- description { state: "clicked" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
- }
- }
- part { name: "arrow2_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "sb_hbar_a2";
- rel2.to: "sb_hbar_a2";
- image.normal: "sym_right_light_normal.png";
- FIXED_SIZE(15, 15)
+ color: 80 80 80 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
+ color: 255 255 255 255;
}
}
- part { name: "shadow_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base_hbar";
- rel2.offset: 2 4;
- rel2.to: "base_hbar";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- rel1.offset: -2 -2;
- rel2.offset: 1 1;
- color: 255 255 255 128;
- }
- }
- part { name: "glow_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
+
+ part { name: "base_hbar"; type: RECT; mouse_events: 0;
+ scale: 1;
+ clip_to: "color_hbar";
description { state: "default" 0.0;
- rel1.offset: -3 -3;
- rel1.to: "base_hbar";
- rel2.offset: 2 2;
- rel2.to: "base_hbar";
- image.normal: "glow_small.png";
- image.border: 7 7 7 7;
- fill.smooth: 0;
- visible: 0;
+ fixed: 1 1;
+ rel.to: "e.dragable.hbar";
+ min: 15 5;
+ max: 999999 5;
+ align: 0.5 1.0;
}
- description { state: "clicked" 0.0;
+ description { state: "over" 0.0;
inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "runner_glow_hbar"; mouse_events: 0;
- clip_to: "runner_hbar_clip";
- description { state: "default" 0.0;
- rel1.offset: -30 0;
- rel1.to_x: "base_hbar";
- rel1.to_y: "runner_hbar_clip";
- rel2.offset: 29 -1;
- rel2.to_x: "base_hbar";
- rel2.to_y: "runner_hbar_clip";
- image.normal: "runner_glow_horiz.png";
- image.border: 33 33 0 0;
- }
- }
- part { name: "base_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.offset: 0 2;
- rel1.to: "e.dragable.hbar";
- rel2.offset: -1 -3;
- rel2.to: "e.dragable.hbar";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- min: 13 5;
- TILED_HORIZ(120)
- }
- }
- part { name: "bevel_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_hbar";
- rel2.to: "base_hbar";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- min: 5 5;
+ min: 15 15;
+ max: 999999 15;
}
}
- part { name: "center_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
+
+ //////////////////////////////////////////////////////////////////////
+
+ part { name: "dim_effect"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "base_hbar";
- rel2.to: "base_hbar";
- image.normal: "holes_tiny_horiz.png";
- FIXED_SIZE(11, 3)
+ color: 0 0 0 0;
}
- }
- part { name: "center_glow_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "center_hbar";
- rel2.to: "center_hbar";
- image.normal: "holes_tiny_glow_horiz.png";
- FIXED_SIZE(17, 11)
- visible: 0;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ description { state: "effect" 0.0;
+ color: 32 32 32 255;
}
}
}
@@ -654,33 +566,42 @@ group { name: "e/widgets/scrollframe";
signal: "mouse,down,1*"; source: "e.dragable.vbar";
action: STATE_SET "clicked" 0.0;
target: "e.dragable.vbar";
- target: "shadow_vbar";
- target: "glow_vbar";
- target: "center_glow_vbar";
+ target: "color_vbar";
+ }
+ program {
+ signal: "mouse,down,*"; source: "e.dragable.vbar";
+ action: SIGNAL_EMIT "e,vbar,press" "e";
}
program {
signal: "mouse,up,1"; source: "e.dragable.vbar";
action: STATE_SET "default" 0.0;
target: "e.dragable.vbar";
- target: "shadow_vbar";
- target: "glow_vbar";
- target: "center_glow_vbar";
+ target: "color_vbar";
+ }
+ program {
+ signal: "mouse,up,*"; source: "e.dragable.vbar";
+ action: SIGNAL_EMIT "e,vbar,unpress" "e";
}
+
program {
signal: "mouse,down,1*"; source: "e.dragable.hbar";
action: STATE_SET "clicked" 0.0;
target: "e.dragable.hbar";
- target: "shadow_hbar";
- target: "glow_hbar";
- target: "center_glow_hbar";
+ target: "color_hbar";
+ }
+ program {
+ signal: "mouse,down,*"; source: "e.dragable.hbar";
+ action: SIGNAL_EMIT "e,hbar,press" "e";
}
program {
signal: "mouse,up,1"; source: "e.dragable.hbar";
action: STATE_SET "default" 0.0;
target: "e.dragable.hbar";
- target: "shadow_hbar";
- target: "glow_hbar";
- target: "center_glow_hbar";
+ target: "color_hbar";
+ }
+ program {
+ signal: "mouse,up,*"; source: "e.dragable.hbar";
+ action: SIGNAL_EMIT "e,hbar,unpress" "e";
}
}
}
--
