rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3349bfe0b8f1589ed6cdf607e60ba1b525a33081
commit 3349bfe0b8f1589ed6cdf607e60ba1b525a33081
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Wed Jul 15 12:19:45 2015 +0300
Styles: replase scroller bar image and adaptate style for it
Change-Id: Id313ec122cdd8361a36c790f0c945387a73df042
---
data/themes/default/images/scroll-bar.png | Bin 186 -> 141 bytes
data/themes/default/widgets/entry.edc | 27 +-
data/themes/default/widgets/genlist.edc | 428 ++++++++++++++++----------
data/themes/default/widgets/scroller.edc | 496 +++++++++++++++++++++---------
4 files changed, 623 insertions(+), 328 deletions(-)
diff --git a/data/themes/default/images/scroll-bar.png
b/data/themes/default/images/scroll-bar.png
index 597093a..ab316af 100644
Binary files a/data/themes/default/images/scroll-bar.png and
b/data/themes/default/images/scroll-bar.png differ
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index 14e60d1..d7b7575 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -109,18 +109,18 @@ group { name: "elm/scroller/entry/default";
type: RECT;
scale: 1;
description { state: "default" 0.0;
- align: 1.0 0.0;
- fixed: 1 0;
- min: 8 0;
- max: 8 -1;
+ align: 1.0 0.5;
+ min: 6 0;
+ max: 6 -1;
rel1 {
- to_y: "bg";
+ to: "bg";
+ offset: 0 1;
}
rel2 {
relative: 1.0 0.0;
- offset: -1 0;
to_x: "bg";
to_y: "sb_hbar";
+ offset: -2 -1;
}
}
description { state: "hidden" 0.0;
@@ -178,8 +178,8 @@ group { name: "elm/scroller/entry/default";
}
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 24;
- max: 8 -1;
+ min: 6 24;
+ max: 6 -1;
color: 0 0 0 0;
rel1 {
relative: 0.5 0.5;
@@ -198,13 +198,14 @@ group { name: "elm/scroller/entry/default";
description { state: "default" 0.0;
align: 0.0 1.0;
fixed: 0 1;
- max: -1 8;
+ max: -1 6;
rel1 {
to_x: "bg";
+ offset: 1 0;
}
rel2 {
relative: 0.0 1.0;
- offset: 0 -2;
+ offset: -1 -3;
to_x: "sb_vbar";
to_y: "bg";
}
@@ -218,7 +219,7 @@ group { name: "elm/scroller/entry/default";
}
rel2 {
relative: 0.0 1.0;
- offset: 0 -3;
+ offset: -1 -3;
to_x: "sb_vbar";
to_y: "bg";
}
@@ -264,8 +265,8 @@ group { name: "elm/scroller/entry/default";
}
description { state: "default" 0.0;
fixed: 1 1;
- min: 24 8;
- max: -1 8;
+ min: 24 6;
+ max: -1 6;
color: 0 0 0 0;
rel1 {
relative: 0.5 0.5;
diff --git a/data/themes/default/widgets/genlist.edc
b/data/themes/default/widgets/genlist.edc
index 721f1a1..a10bb6e 100644
--- a/data/themes/default/widgets/genlist.edc
+++ b/data/themes/default/widgets/genlist.edc
@@ -1323,40 +1323,20 @@ group { name:
"elm/genlist/item/history_inactive/default";
}
group { name: "elm/genlist/base/default";
- images {
- image: "scroll-indicator.png" COMP;
- image: "scroll-area-dark.png" COMP;
- image: "section-border.png" COMP;
- }
data {
item: "focus_highlight" "on";
}
+ images {
+ image: "scroll-runner-vbar.png" COMP;
+ image: "scroll-runner-hbar.png" COMP;
+ image: "scroll-bar.png" COMP;
+ image: "section-border.png" COMP;
+ }
parts {
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
- color: 52 53 54 255;
- }
- }
- 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;
- visible: 0;
- rel1 {
- offset: -11 -11;
- }
- rel2 {
- offset: 10 10;
- }
+ color_class: "bg_main";
}
}
part { name: "sb_vbar";
@@ -1365,13 +1345,16 @@ group { name: "elm/genlist/base/default";
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 0;
- min: 8 8;
+ min: 6 8;
+ max: 6 -1;
rel1 {
- relative: 1.0 0.0;
- offset: -1 0;
+ offset: 0 1;
+ to: "bg";
}
rel2 {
relative: 1.0 0.0;
+ offset: -2 -2;
+ to_x: "bg";
to_y: "sb_hbar";
}
}
@@ -1380,28 +1363,17 @@ group { name: "elm/genlist/base/default";
fixed: 1 0;
max: 0 -1;
rel1 {
- relative: 1.0 0.0;
- offset: -1 0;
+ offset: 0 1;
+ to: "bg";
}
rel2 {
relative: 1.0 0.0;
+ offset: -2 -2;
+ to_x: "bg";
to_y: "sb_hbar";
}
}
}
- part { name: "sb_vbar_base";
- type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1 {
- to: "sb_vbar";
- }
- rel2 {
- to: "sb_vbar";
- }
- }
- }
part { name: "sb_vbar_p1";
type: RECT;
clip_to: "sb_vbar";
@@ -1437,41 +1409,19 @@ group { name: "elm/genlist/base/default";
dragable {
x: 0 0 0;
y: 1 1 0;
- confine: "sb_vbar_base";
+ confine: "sb_vbar";
}
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 8;
- max: 8 -1;
+ min: 6 24;
+ max: 6 -1;
color: 0 0 0 0;
rel1 {
- relative: 0.5 0.5;
- to: "sb_vbar_base";
- }
- rel2 {
- relative: 0.5 0.5;
- to: "sb_vbar_base";
- }
- }
- }
- 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;
- visible: 0;
- rel1 {
- offset: -11 -11;
+ to: "sb_vbar";
}
rel2 {
- offset: 10 10;
+ relative: 0.0 0.0;
+ to: "sb_vbar";
}
}
}
@@ -1482,15 +1432,17 @@ group { name: "elm/genlist/base/default";
description { state: "default" 0.0;
align: 0.0 1.0;
fixed: 0 1;
- min: 8 8;
+ min: 0 6;
+ max: -1 6;
rel1 {
- relative: 0.0 1.0;
- offset: 0 -1;
+ offset: 1 0;
+ to: "bg";
}
rel2 {
relative: 0.0 1.0;
- offset: -1 -2;
+ offset: -2 -2;
to_x: "sb_vbar";
+ to_y: "bg";
}
}
description { state: "hidden" 0.0;
@@ -1498,26 +1450,14 @@ group { name: "elm/genlist/base/default";
fixed: 0 1;
max: -1 0;
rel1 {
- relative: 0.0 1.0;
- offset: 0 -1;
+ offset: 1 0;
+ to: "bg";
}
rel2 {
relative: 0.0 1.0;
- offset: -1 -2;
+ offset: -2 -2;
to_x: "sb_vbar";
- }
- }
- }
- part { name: "sb_hbar_base";
- type: RECT;
- clip_to: "sb_hbar";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1 {
- to: "sb_hbar";
- }
- rel2 {
- to: "sb_hbar";
+ to_y: "bg";
}
}
}
@@ -1525,6 +1465,7 @@ group { name: "elm/genlist/base/default";
type: RECT;
clip_to: "sb_hbar";
description { state: "default" 0.0;
+ fixed: 1 1;
color: 0 0 0 0;
rel1 {
to: "sb_hbar";
@@ -1556,20 +1497,19 @@ group { name: "elm/genlist/base/default";
dragable {
x: 1 1 0;
y: 0 0 0;
- confine: "sb_hbar_base";
+ confine: "sb_hbar";
}
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 8;
- max: -1 8;
+ min: 24 6;
+ max: -1 6;
color: 0 0 0 0;
rel1 {
- relative: 0.5 0.5;
- to: "sb_hbar_base";
+ to: "sb_hbar";
}
rel2 {
- relative: 0.5 0.5;
- to: "sb_hbar_base";
+ relative: 0.0 0.0;
+ to: "sb_hbar";
}
}
}
@@ -1577,10 +1517,10 @@ group { name: "elm/genlist/base/default";
type: RECT;
description { state: "default" 0.0;
rel1 {
- to: "elm.swallow.background";
+ to: "elm.swallow.content";
}
rel2 {
- to: "elm.swallow.background";
+ to: "elm.swallow.content";
}
}
}
@@ -1588,10 +1528,11 @@ group { name: "elm/genlist/base/default";
type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
+ rel1 {
+ to: "elm.swallow.content";
+ }
rel2 {
- relative: 0.0 0.0;
- to_x: "sb_vbar";
- to_y: "sb_hbar";
+ to: "elm.swallow.content";
}
}
}
@@ -1600,15 +1541,18 @@ group { name: "elm/genlist/base/default";
clip_to: "clipper";
description { state: "default" 0.0;
rel1 {
- to: "elm.swallow.background";
+ to: "bg";
}
rel2 {
- to: "elm.swallow.background";
+ relative: 0.0 0.0;
+ to_x: "sb_vbar";
+ to_y: "sb_hbar";
}
}
}
part { name: "elm.swallow.overlay";
type: SWALLOW;
+ repeat_events: 1;
clip_to: "clipper";
description { state: "default" 0.0;
rel1 {
@@ -1622,20 +1566,43 @@ group { name: "elm/genlist/base/default";
part { name: "runner_vbar";
type: IMAGE;
mouse_events: 0;
- clip_to: "sb_vbar_show";
description { state: "default" 0.0;
fixed: 1 1;
min: 8 8;
max: 8 -1;
rel1 {
- to: "sb_vbar_base";
+ offset: -1 -1;
+ to: "sb_vbar";
}
rel2 {
- to: "sb_vbar_base";
+ offset: 0 0;
+ to: "sb_vbar";
}
image {
- normal: "scroll-area-dark.png";
- border: 2 2 2 2;
+ normal: "scroll-runner-vbar.png";
+ border: 3 3 3 3;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "hidden" 0.0;
+ visible: 0;
+ fixed: 1 1;
+ min: 8 8;
+ max: 8 -1;
+ rel1 {
+ offset: -1 -1;
+ to: "sb_vbar";
+ }
+ rel2 {
+ offset: 0 0;
+ to: "sb_vbar";
+ }
+ image {
+ normal: "scroll-runner-vbar.png";
+ border: 3 3 3 3;
middle: DEFAULT;
}
fill {
@@ -1646,19 +1613,42 @@ group { name: "elm/genlist/base/default";
part { name: "runner_hbar";
type: IMAGE;
mouse_events: 0;
- clip_to: "sb_hbar_show";
description { state: "default" 0.0;
fixed: 1 1;
min: 8 8;
max: -1 8;
rel1 {
- to: "sb_hbar_base";
+ offset: -1 0;
+ to: "sb_hbar";
}
rel2 {
- to: "sb_hbar_base";
+ offset: 0 -1;
+ to: "sb_hbar";
}
image {
- normal: "scroll-area-dark.png";
+ normal: "scroll-runner-hbar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "hidden" 0.0;
+ visible: 0;
+ fixed: 1 1;
+ min: 8 8;
+ max: -1 8;
+ rel1 {
+ offset: -1 0;
+ to: "sb_hbar";
+ }
+ rel2 {
+ offset: 0 -1;
+ to: "sb_hbar";
+ }
+ image {
+ normal: "scroll-runner-hbar.png";
border: 2 2 2 2;
middle: DEFAULT;
}
@@ -1670,21 +1660,53 @@ group { name: "elm/genlist/base/default";
part { name: "base_vbar";
type: IMAGE;
mouse_events: 0;
- clip_to: "sb_vbar_show";
+ clip_to: "sb_vbar";
description { state: "default" 0.0;
fixed: 1 0;
- min: 8 8;
- max: 8 -1;
rel1 {
- offset: 2 0;
to: "elm.dragable.vbar";
}
rel2 {
- offset: -3 -1;
to: "elm.dragable.vbar";
}
image {
- normal: "scroll-indicator.png";
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "focused" 0.0;
+ fixed: 1 0;
+ color_class: "select_light";
+ rel1 {
+ to: "elm.dragable.vbar";
+ }
+ rel2 {
+ to: "elm.dragable.vbar";
+ }
+ image {
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "clicked" 0.0;
+ fixed: 1 0;
+ color_class: "select";
+ rel1 {
+ to: "elm.dragable.vbar";
+ }
+ rel2 {
+ to: "elm.dragable.vbar";
+ }
+ image {
+ normal: "scroll-bar.png";
border: 2 2 2 2;
middle: DEFAULT;
}
@@ -1696,21 +1718,53 @@ group { name: "elm/genlist/base/default";
part { name: "base_hbar";
type: IMAGE;
mouse_events: 0;
- clip_to: "sb_hbar_show";
+ clip_to: "sb_hbar";
description { state: "default" 0.0;
fixed: 0 1;
- min: 8 8;
- max: -1 8;
rel1 {
- offset: 0 2;
to: "elm.dragable.hbar";
}
rel2 {
- offset: -1 -3;
to: "elm.dragable.hbar";
}
image {
- normal: "scroll-indicator.png";
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "focused" 0.0;
+ fixed: 0 1;
+ color_class: "select_light";
+ rel1 {
+ to: "elm.dragable.hbar";
+ }
+ rel2 {
+ to: "elm.dragable.hbar";
+ }
+ image {
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "clicked" 0.0;
+ fixed: 0 1;
+ color_class: "select";
+ rel1 {
+ to: "elm.dragable.hbar";
+ }
+ rel2 {
+ to: "elm.dragable.hbar";
+ }
+ image {
+ normal: "scroll-bar.png";
border: 2 2 2 2;
middle: DEFAULT;
}
@@ -1732,88 +1786,130 @@ group { name: "elm/genlist/base/default";
}
}
programs {
- program { name: "vertical_scroll_down";
+ program { name: "v_mouse_down";
signal: "mouse,down,1*";
- source: "sb_vbar_p1";
- action: DRAG_VAL_PAGE 0.0000 -1.0000;
+ source: "elm.dragable.vbar";
+ action: STATE_SET "clicked" 0.00;
target: "elm.dragable.vbar";
+ after: "v_bar_selected";
}
- program { name: "vertical_scroll_up";
+ program { name: "h_mouse_down";
signal: "mouse,down,1*";
- source: "sb_vbar_p2";
- action: DRAG_VAL_PAGE 0.0000 1.0000;
- target: "elm.dragable.vbar";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "clicked" 0.00;
+ target: "elm.dragable.hbar";
+ after: "h_bar_selected";
}
program { name: "horizontal_scroll_down";
signal: "mouse,down,1*";
source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0000 0.0000;
- target: "elm.dragable.hbar";
+ target: "elm.dragable.vbar";
}
program { name: "horizontal_scroll_up";
signal: "mouse,down,1*";
source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0000 0.0000;
- target: "elm.dragable.hbar";
+ target: "elm.dragable.vbar";
}
- program { name: "program_0x1b77480";
+ program { name: "vertical_scroll_down";
signal: "mouse,down,1*";
- source: "elm.dragable.vbar";
- action: STATE_SET "clicked" 0.00;
- target: "elm.dragable.vbar";
+ source: "sb_vbar_p1";
+ action: DRAG_VAL_PAGE 0.0000 -1.0000;
+ target: "elm.dragable.hbar";
}
- program { name: "program_0x1b77ac0";
+ program { name: "vertical_scroll_up";
signal: "mouse,down,1*";
- source: "elm.dragable.hbar";
- action: STATE_SET "clicked" 0.00;
+ source: "sb_vbar_p2";
+ action: DRAG_VAL_PAGE 0.0000 1.0000;
target: "elm.dragable.hbar";
}
program { name: "reload_on_load";
signal: "load";
source: "";
- script {
- emit("reload", "elm");
- }
+ action: SIGNAL_EMIT "reload" "elm";
}
- program { name: "show_vertical_scroll";
- signal: "elm,action,show,vbar";
- source: "elm";
+ program { name: "v_mouse_up";
+ signal: "mouse,up,1";
+ source: "elm.dragable.vbar";
action: STATE_SET "default" 0.00;
- target: "sb_vbar";
- target: "sb_vbar_show";
+ target: "elm.dragable.vbar";
+ after: "v_bar_unselected";
}
- program { name: "hide_vertical_scroll";
- signal: "elm,action,hide,vbar";
- source: "elm";
- action: STATE_SET "hidden" 0.00;
- target: "sb_vbar";
- target: "sb_vbar_show";
+ program { name: "h_mouse_up";
+ signal: "mouse,up,1";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "default" 0.00;
+ target: "elm.dragable.hbar";
+ after: "h_bar_unselected";
}
program { name: "show_horizontal_scroll";
signal: "elm,action,show,hbar";
source: "elm";
action: STATE_SET "default" 0.00;
target: "sb_hbar";
- target: "sb_hbar_show";
+ target: "runner_hbar";
}
program { name: "hide_horizontal_scroll";
signal: "elm,action,hide,hbar";
source: "elm";
action: STATE_SET "hidden" 0.00;
target: "sb_hbar";
- target: "sb_hbar_show";
+ target: "runner_hbar";
}
- program { name: "program_0x1b77750";
- signal: "mouse,up,1";
+ program { name: "show_vertical_scroll";
+ signal: "elm,action,show,vbar";
+ source: "elm";
+ action: STATE_SET "default" 0.00;
+ target: "sb_vbar";
+ target: "runner_vbar";
+ }
+ program { name: "hide_vertical_scroll";
+ signal: "elm,action,hide,vbar";
+ source: "elm";
+ action: STATE_SET "hidden" 0.00;
+ target: "sb_vbar";
+ target: "runner_vbar";
+ }
+ program { name: "v_bar_selected";
+ action: STATE_SET "clicked" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "v_bar_unselected";
+ action: STATE_SET "default" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "v_mouse_in";
+ signal: "mouse,in";
+ source: "elm.dragable.vbar";
+ action: STATE_SET "focused" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "v_mouse_out";
+ signal: "mouse,out";
source: "elm.dragable.vbar";
action: STATE_SET "default" 0.00;
- target: "elm.dragable.vbar";
+ target: "base_vbar";
}
- program { name: "program_0x1b77e10";
- signal: "mouse,up,1";
+ program { name: "h_bar_selected";
+ action: STATE_SET "clicked" 0.00;
+ target: "base_hbar";
+ }
+ program { name: "h_bar_unselected";
+ action: STATE_SET "default" 0.00;
+ target: "base_hbar";
+ }
+ program { name: "h_mouse_in";
+ signal: "mouse,in";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "focused" 0.00;
+ target: "base_hbar";
+ }
+ program { name: "h_mouse_out";
+ signal: "mouse,out";
source: "elm.dragable.hbar";
action: STATE_SET "default" 0.00;
- target: "elm.dragable.hbar";
+ target: "base_hbar";
}
}
}
diff --git a/data/themes/default/widgets/scroller.edc
b/data/themes/default/widgets/scroller.edc
index eeeed67..e627977 100644
--- a/data/themes/default/widgets/scroller.edc
+++ b/data/themes/default/widgets/scroller.edc
@@ -1,54 +1,51 @@
group { name: "elm/scroller/base/default";
+ data {
+ item: "focus_highlight" "on";
+ }
images {
- image: "scroll-bar.png" COMP;
image: "scroll-runner-vbar.png" COMP;
image: "scroll-runner-hbar.png" COMP;
+ image: "scroll-bar.png" COMP;
}
- data.item: "focus_highlight" "on";
-
parts {
- program {
- name: "reload_on_load";
- signal: "load"; source: "";
- script {
- emit("reload", "elm");
- }
- }
-// vert bar ////////////////////////////////////////////////////////////////
part { name: "base";
type: SPACER;
description { state: "default" 0.0;
}
}
- part { name: "bg";
- type: IMAGE;
- description { state: "default" 0.0;
- /* background the image will watch
- * used here because no mater scroller
- * didn't have default */
- image.normal: "scroll-bar.png";
- visible: 0;
- }
- }
part { name: "sb_vbar";
type: RECT;
scale: 1;
description { state: "default" 0.0;
- fixed: 1 0;
- min: 8 8;
- max: 8 -1;
align: 1.0 0.0;
- rel1.to: "base";
+ fixed: 1 0;
+ min: 6 8;
+ max: 6 -1;
+ rel1 {
+ offset: 0 1;
+ to: "base";
+ }
rel2 {
+ relative: 1.0 0.0;
+ offset: -2 -2;
to_x: "base";
to_y: "sb_hbar";
- relative: 1.0 0.0;
}
}
description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
+ align: 1.0 0.0;
+ fixed: 1 0;
max: 0 -1;
+ rel1 {
+ offset: 0 1;
+ to: "base";
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ offset: -2 -2;
+ to_x: "base";
+ to_y: "sb_hbar";
+ }
}
}
part { name: "sb_vbar_p1";
@@ -57,7 +54,6 @@ group { name: "elm/scroller/base/default";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1 {
- relative: 0.0 0.0;
to: "sb_vbar";
}
rel2 {
@@ -76,56 +72,67 @@ group { name: "elm/scroller/base/default";
to: "elm.dragable.vbar";
}
rel2 {
- relative: 1.0 1.0;
to: "sb_vbar";
}
}
}
part { name: "elm.dragable.vbar";
type: RECT;
- clip_to: "sb_vbar";
scale: 1;
+ clip_to: "sb_vbar";
+ dragable {
+ x: 0 0 0;
+ y: 1 1 0;
+ confine: "sb_vbar";
+ }
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 8;
- max: 8 -1;
+ min: 6 24;
+ max: 6 -1;
+ color: 0 0 0 0;
rel1 {
- relative: 0.5 0.5;
to: "sb_vbar";
}
rel2 {
- relative: 0.5 0.5;
+ relative: 0.0 0.0;
to: "sb_vbar";
}
- color: 0 0 0 0;
- }
- dragable {
- x: 0 0 0;
- y: 1 1 0;
- confine: "sb_vbar";
}
}
-// horiz bar /////////////////////////////////////////////////////////////
part { name: "sb_hbar";
type: RECT;
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- fixed: 0 1;
- min: 8 8;
- max: -1 8;
align: 0.0 1.0;
- rel1.to: "base";
+ fixed: 0 1;
+ min: 0 6;
+ max: -1 6;
+ rel1 {
+ offset: 1 0;
+ to: "base";
+ }
rel2 {
+ relative: 0.0 1.0;
+ offset: -2 -2;
to_x: "sb_vbar";
to_y: "base";
- relative: 0.0 1.0;
}
}
description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
+ align: 0.0 1.0;
+ fixed: 0 1;
max: -1 0;
+ rel1 {
+ offset: 1 0;
+ to: "base";
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ offset: -2 -2;
+ to_x: "sb_vbar";
+ to_y: "base";
+ }
}
}
part { name: "sb_hbar_p1";
@@ -135,7 +142,6 @@ group { name: "elm/scroller/base/default";
fixed: 1 1;
color: 0 0 0 0;
rel1 {
- relative: 0.0 0.0;
to: "sb_hbar";
}
rel2 {
@@ -154,56 +160,63 @@ group { name: "elm/scroller/base/default";
to: "elm.dragable.hbar";
}
rel2 {
- relative: 1.0 1.0;
to: "sb_hbar";
}
}
}
part { name: "elm.dragable.hbar";
type: RECT;
- clip_to: "sb_hbar";
scale: 1;
+ clip_to: "sb_hbar";
+ dragable {
+ x: 1 1 0;
+ y: 0 0 0;
+ confine: "sb_hbar";
+ }
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 8;
- max: -1 8;
+ min: 24 6;
+ max: -1 6;
color: 0 0 0 0;
rel1 {
- relative: 0.5 0.5;
to: "sb_hbar";
}
rel2 {
- relative: 0.5 0.5;
+ relative: 0.0 0.0;
to: "sb_hbar";
}
}
- dragable {
- x: 1 1 0;
- y: 0 0 0;
- confine: "sb_hbar";
- }
}
part { name: "clipper";
type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ rel1 {
+ to: "elm.swallow.content";
+ }
+ rel2 {
+ to: "elm.swallow.content";
+ }
}
}
- /* it's a background for scrolled content */
part { name: "elm.swallow.background";
type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ rel1 {
+ to: "elm.swallow.content";
+ }
+ rel2 {
+ to: "elm.swallow.content";
+ }
}
}
- part { name: "elm.swallow.content";
+ part { name: "elm.swallow.content";
type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "base";
+ rel1 {
+ to: "base";
+ }
rel2 {
relative: 0.0 0.0;
to_x: "sb_vbar";
@@ -213,168 +226,353 @@ group { name: "elm/scroller/base/default";
}
part { name: "elm.swallow.overlay";
type: SWALLOW;
- mouse_events: 1;
repeat_events: 1;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ rel1 {
+ to: "elm.swallow.content";
+ }
+ rel2 {
+ to: "elm.swallow.content";
+ }
}
}
part { name: "runner_vbar";
+ type: IMAGE;
mouse_events: 0;
- clip_to: "sb_vbar";
description { state: "default" 0.0;
fixed: 1 1;
+ min: 8 8;
+ max: 8 -1;
+ rel1 {
+ offset: -1 -1;
+ to: "sb_vbar";
+ }
+ rel2 {
+ offset: 0 0;
+ to: "sb_vbar";
+ }
image {
normal: "scroll-runner-vbar.png";
border: 3 3 3 3;
+ middle: DEFAULT;
}
- fill.smooth: 0;
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "hidden" 0.0;
+ visible: 0;
+ fixed: 1 1;
min: 8 8;
max: 8 -1;
- rel1.to: "sb_vbar";
- rel2.to: "sb_vbar";
- }
+ rel1 {
+ offset: -1 -1;
+ to: "sb_vbar";
+ }
+ rel2 {
+ offset: 0 0;
+ to: "sb_vbar";
+ }
+ image {
+ normal: "scroll-runner-vbar.png";
+ border: 3 3 3 3;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
}
part { name: "runner_hbar";
+ type: IMAGE;
mouse_events: 0;
- clip_to: "sb_hbar";
description { state: "default" 0.0;
fixed: 1 1;
+ min: 8 8;
+ max: -1 8;
+ rel1 {
+ offset: -1 0;
+ to: "sb_hbar";
+ }
+ rel2 {
+ offset: 0 -1;
+ to: "sb_hbar";
+ }
image {
normal: "scroll-runner-hbar.png";
border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
}
- fill.smooth: 0;
+ }
+ description { state: "hidden" 0.0;
+ visible: 0;
+ fixed: 1 1;
min: 8 8;
max: -1 8;
- rel1.to: "sb_hbar";
- rel2.to: "sb_hbar";
- }
- }
- part { name: "cross";
- type: SPACER;
- description { state: "default" 0.0;
rel1 {
- to_x: "sb_vbar";
- to_y: "sb_hbar";
+ offset: -1 0;
+ to: "sb_hbar";
}
rel2 {
- to_x: "sb_vbar";
- to_y: "sb_hbar";
+ offset: 0 -1;
+ to: "sb_hbar";
+ }
+ image {
+ normal: "scroll-runner-hbar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
}
}
}
part { name: "base_vbar";
+ type: IMAGE;
mouse_events: 0;
clip_to: "sb_vbar";
description { state: "default" 0.0;
fixed: 1 0;
- min: 8 8;
- max: 8 -1;
+ rel1 {
+ to: "elm.dragable.vbar";
+ }
+ rel2 {
+ to: "elm.dragable.vbar";
+ }
image {
normal: "scroll-bar.png";
border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "focused" 0.0;
+ fixed: 1 0;
+ color_class: "select_light";
+ rel1 {
+ to: "elm.dragable.vbar";
+ }
+ rel2 {
+ to: "elm.dragable.vbar";
+ }
+ image {
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "clicked" 0.0;
+ fixed: 1 0;
+ color_class: "select";
+ rel1 {
+ to: "elm.dragable.vbar";
+ }
+ rel2 {
+ to: "elm.dragable.vbar";
+ }
+ image {
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
}
- fill.smooth: 0;
- rel1.to: "elm.dragable.vbar";
- rel2.to: "elm.dragable.vbar";
}
}
part { name: "base_hbar";
+ type: IMAGE;
mouse_events: 0;
clip_to: "sb_hbar";
description { state: "default" 0.0;
fixed: 0 1;
+ rel1 {
+ to: "elm.dragable.hbar";
+ }
+ rel2 {
+ to: "elm.dragable.hbar";
+ }
image {
normal: "scroll-bar.png";
border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "focused" 0.0;
+ fixed: 0 1;
+ color_class: "select_light";
+ rel1 {
+ to: "elm.dragable.hbar";
+ }
+ rel2 {
+ to: "elm.dragable.hbar";
+ }
+ image {
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description { state: "clicked" 0.0;
+ fixed: 0 1;
+ color_class: "select";
+ rel1 {
+ to: "elm.dragable.hbar";
+ }
+ rel2 {
+ to: "elm.dragable.hbar";
+ }
+ image {
+ normal: "scroll-bar.png";
+ border: 2 2 2 2;
+ middle: DEFAULT;
+ }
+ fill {
+ smooth: 0;
}
- fill.smooth: 0;
- min: 8 8;
- max: -1 8;
- rel1.to: "elm.dragable.hbar";
- rel2.to: "elm.dragable.hbar";
}
}
}
programs {
program { name: "v_mouse_down";
- signal: "mouse,down,1*"; source: "elm.dragable.vbar";
- action: STATE_SET "clicked" 0.0;
+ signal: "mouse,down,1*";
+ source: "elm.dragable.vbar";
+ action: STATE_SET "clicked" 0.00;
target: "elm.dragable.vbar";
+ after: "v_bar_selected";
}
- program { name: "v_mouse_up";
- signal: "mouse,up,1"; source: "elm.dragable.vbar";
- action: STATE_SET "default" 0.0;
+ program { name: "h_mouse_down";
+ signal: "mouse,down,1*";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "clicked" 0.00;
+ target: "elm.dragable.hbar";
+ after: "h_bar_selected";
+ }
+ program { name: "horizontal_scroll_down";
+ signal: "mouse,down,1*";
+ source: "sb_hbar_p1";
+ action: DRAG_VAL_PAGE -1.0000 0.0000;
target: "elm.dragable.vbar";
}
- program { name: "h_mouse_down";
- signal: "mouse,down,1*"; source: "elm.dragable.hbar";
- action: STATE_SET "clicked" 0.0;
+ program { name: "horizontal_scroll_up";
+ signal: "mouse,down,1*";
+ source: "sb_hbar_p2";
+ action: DRAG_VAL_PAGE 1.0000 0.0000;
+ target: "elm.dragable.vbar";
+ }
+ program { name: "vertical_scroll_down";
+ signal: "mouse,down,1*";
+ source: "sb_vbar_p1";
+ action: DRAG_VAL_PAGE 0.0000 -1.0000;
+ target: "elm.dragable.hbar";
+ }
+ program { name: "vertical_scroll_up";
+ signal: "mouse,down,1*";
+ source: "sb_vbar_p2";
+ action: DRAG_VAL_PAGE 0.0000 1.0000;
target: "elm.dragable.hbar";
}
+ program { name: "reload_on_load";
+ signal: "load";
+ source: "";
+ action: SIGNAL_EMIT "reload" "elm";
+ }
+ program { name: "v_mouse_up";
+ signal: "mouse,up,1";
+ source: "elm.dragable.vbar";
+ action: STATE_SET "default" 0.00;
+ target: "elm.dragable.vbar";
+ after: "v_bar_unselected";
+ }
program { name: "h_mouse_up";
- signal: "mouse,up,1"; source: "elm.dragable.hbar";
- action: STATE_SET "default" 0.0;
+ signal: "mouse,up,1";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "default" 0.00;
target: "elm.dragable.hbar";
+ after: "h_bar_unselected";
}
- program {
- name: "show_horizontal_scroll";
+ program { name: "show_horizontal_scroll";
signal: "elm,action,show,hbar";
source: "elm";
- action: STATE_SET "default" 0.0;
+ action: STATE_SET "default" 0.00;
target: "sb_hbar";
+ target: "runner_hbar";
}
- program {
- name: "hide_horizontal_scroll";
+ program { name: "hide_horizontal_scroll";
signal: "elm,action,hide,hbar";
source: "elm";
- action: STATE_SET "hidden" 0.0;
+ action: STATE_SET "hidden" 0.00;
target: "sb_hbar";
+ target: "runner_hbar";
}
- program {
- name: "horizontal_scroll_down";
- signal: "mouse,down,1*";
- source: "sb_hbar_p1";
- action: DRAG_VAL_PAGE -1.0 0.0;
- target: "elm.dragable.hbar";
- }
- program {
- name: "horizontal_scroll_up";
- signal: "mouse,down,1*";
- source: "sb_hbar_p2";
- action: DRAG_VAL_PAGE 1.0 0.0;
- target: "elm.dragable.hbar";
- }
- program {
- name: "show_vertical_scroll";
+ program { name: "show_vertical_scroll";
signal: "elm,action,show,vbar";
source: "elm";
- action: STATE_SET "default" 0.0;
+ action: STATE_SET "default" 0.00;
target: "sb_vbar";
+ target: "runner_vbar";
}
- program {
- name: "hide_vertical_scroll";
+ program { name: "hide_vertical_scroll";
signal: "elm,action,hide,vbar";
source: "elm";
- action: STATE_SET "hidden" 0.0;
+ action: STATE_SET "hidden" 0.00;
target: "sb_vbar";
- }
- program {
- name: "vertical_scroll_down";
- signal: "mouse,down,1*";
- source: "sb_vbar_p1";
- action: DRAG_VAL_PAGE 0.0 -1.0;
- target: "elm.dragable.vbar";
- }
- program {
- name: "vertical_scroll_up";
- signal: "mouse,down,1*";
- source: "sb_vbar_p2";
- action: DRAG_VAL_PAGE 0.0 1.0;
- target: "elm.dragable.vbar";
+ target: "runner_vbar";
+ }
+ program { name: "v_bar_selected";
+ action: STATE_SET "clicked" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "v_bar_unselected";
+ action: STATE_SET "default" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "v_mouse_in";
+ signal: "mouse,in";
+ source: "elm.dragable.vbar";
+ action: STATE_SET "focused" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "v_mouse_out";
+ signal: "mouse,out";
+ source: "elm.dragable.vbar";
+ action: STATE_SET "default" 0.00;
+ target: "base_vbar";
+ }
+ program { name: "h_bar_selected";
+ action: STATE_SET "clicked" 0.00;
+ target: "base_hbar";
+ }
+ program { name: "h_bar_unselected";
+ action: STATE_SET "default" 0.00;
+ target: "base_hbar";
+ }
+ program { name: "h_mouse_in";
+ signal: "mouse,in";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "focused" 0.00;
+ target: "base_hbar";
+ }
+ program { name: "h_mouse_out";
+ signal: "mouse,out";
+ source: "elm.dragable.hbar";
+ action: STATE_SET "default" 0.00;
+ target: "base_hbar";
}
}
}
--
