Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
iconbox.edc scrollbar.edc slider.edc spinner.edc tree.edc
Log Message:
* [Theme] Clip the parts of the scrollbars
* [Theme] Use "mouse,down,1*" instead of "mouse,down,1", so double clic
is now supported.
* [Textblock] More work
Congrats to Italians :o :)
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/iconbox.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- iconbox.edc 11 Apr 2006 16:41:44 -0000 1.2
+++ iconbox.edc 10 Jul 2006 03:26:53 -0000 1.3
@@ -95,6 +95,21 @@
min: 68 18;
parts {
part {
+ name: "clip";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.5;
+ offset: -6 -2;
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: 4 13;
+ }
+ }
+ }
+ part {
name: "trough";
description {
state: "default" 0.0;
@@ -130,10 +145,10 @@
}
}
}
- SCROLLBAR_DRAG("drag", 20, 16, 1, 0, "scrollbar_hdrag1.png",
"scrollbar_hdrag2.png", "scrollbar_hdrag_thumb.png")
- SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -6, -2,
"scrollbar_button_left1.png", "scrollbar_button_left2.png")
- SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -27, -2,
"scrollbar_button_left1.png", "scrollbar_button_left2.png")
- SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -11, -2,
"scrollbar_button_right1.png", "scrollbar_button_right2.png")
+ SCROLLBAR_DRAG("drag", 20, 16, 1, 0, "scrollbar_hdrag1.png",
"scrollbar_hdrag2.png", "scrollbar_hdrag_thumb.png", "clip")
+ SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -6, -2,
"scrollbar_button_left1.png", "scrollbar_button_left2.png", "clip")
+ SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -27, -2,
"scrollbar_button_left1.png", "scrollbar_button_left2.png", "clip")
+ SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -11, -2,
"scrollbar_button_right1.png", "scrollbar_button_right2.png", "clip")
}
programs {
SCROLLBAR_DRAG_PROG("drag")
@@ -144,62 +159,24 @@
}
group {
- name: "iconbox/label";
- data {
- item: "inset" "8 6 0 0";
- }
+ name: "iconbox/scrolled_view/vscrollbar";
+ min: 18 68;
parts {
part {
- name: "background";
+ name: "clip";
+ type: RECT;
description {
state: "default" 0.0;
- visible: 0;
rel1 {
- relative: 0.0 0.0;
- offset: 0 -3;
+ relative: 0.5 0.0;
+ offset: -2 -6;
}
rel2 {
- relative: 1.0 1.0;
- offset: 0 3;
- }
- image {
- normal: "iconbox_label_bg.png";
- border: 12 15 12 15;
- middle: 0;
- }
- fill {
- smooth: 0;
+ relative: 0.5 1.0;
+ offset: 13 4;
}
}
- description {
- state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
}
- }
- programs {
- program {
- name: "select";
- signal: "select";
- source: "";
- action: STATE_SET "selected" 0.0;
- target: "background";
- }
- program {
- name: "unselect";
- signal: "unselect";
- source: "";
- action: STATE_SET "default" 0.0;
- target: "background";
- }
- }
-}
-
-group {
- name: "iconbox/scrolled_view/vscrollbar";
- min: 18 68;
- parts {
part {
name: "trough";
description {
@@ -236,16 +213,69 @@
}
}
}
- SCROLLBAR_DRAG("drag", 16, 20, 0, 1, "scrollbar_vdrag1.png",
"scrollbar_vdrag2.png", "scrollbar_vdrag_thumb.png")
- SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -2, -6,
"scrollbar_button_up1.png", "scrollbar_button_up2.png")
- SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -2, -27,
"scrollbar_button_up1.png", "scrollbar_button_up2.png")
- SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -2, -11,
"scrollbar_button_down1.png", "scrollbar_button_down2.png")
+ SCROLLBAR_DRAG("drag", 16, 20, 0, 1, "scrollbar_vdrag1.png",
"scrollbar_vdrag2.png", "scrollbar_vdrag_thumb.png", "clip")
+ SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -2, -6,
"scrollbar_button_up1.png", "scrollbar_button_up2.png", "clip")
+ SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -2, -27,
"scrollbar_button_up1.png", "scrollbar_button_up2.png", "clip")
+ SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -2, -11,
"scrollbar_button_down1.png", "scrollbar_button_down2.png", "clip")
}
programs {
SCROLLBAR_DRAG_PROG("drag")
SCROLLBAR_BUTTON_PROG("up_up_arrow", "up")
SCROLLBAR_BUTTON_PROG("down_up_arrow", "up")
SCROLLBAR_BUTTON_PROG("down_down_arrow", "down")
+ }
+}
+
+group {
+ name: "iconbox/label";
+ data {
+ item: "inset" "8 6 0 0";
+ }
+ parts {
+ part {
+ name: "background";
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 -3;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: 0 3;
+ }
+ image {
+ normal: "iconbox_label_bg.png";
+ border: 12 15 12 15;
+ middle: 0;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ description {
+ state: "selected" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ }
+ programs {
+ program {
+ name: "select";
+ signal: "select";
+ source: "";
+ action: STATE_SET "selected" 0.0;
+ target: "background";
+ }
+ program {
+ name: "unselect";
+ signal: "unselect";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "background";
+ }
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/scrollbar.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- scrollbar.edc 20 Nov 2005 10:33:28 -0000 1.5
+++ scrollbar.edc 10 Jul 2006 03:26:53 -0000 1.6
@@ -3,6 +3,23 @@
min: 68 18;
parts {
part {
+ name: "clip";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ to: "trough";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ to: "trough";
+ }
+ }
+ }
+ part {
name: "trough";
description {
state: "default" 0.0;
@@ -36,10 +53,10 @@
}
}
}
- SCROLLBAR_DRAG("drag", 20, 16, 1, 0, "scrollbar_hdrag1.png",
"scrollbar_hdrag2.png", "scrollbar_hdrag_thumb.png")
- SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, 0, -8,
"scrollbar_button_left1.png", "scrollbar_button_left2.png")
- SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -33, -8,
"scrollbar_button_left1.png", "scrollbar_button_left2.png")
- SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -17, -8,
"scrollbar_button_right1.png", "scrollbar_button_right2.png")
+ SCROLLBAR_DRAG("drag", 20, 16, 1, 0, "scrollbar_hdrag1.png",
"scrollbar_hdrag2.png", "scrollbar_hdrag_thumb.png", "clip")
+ SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, 0, -8,
"scrollbar_button_left1.png", "scrollbar_button_left2.png", "clip")
+ SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -33, -8,
"scrollbar_button_left1.png", "scrollbar_button_left2.png", "clip")
+ SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -17, -8,
"scrollbar_button_right1.png", "scrollbar_button_right2.png", "clip")
}
programs {
SCROLLBAR_DRAG_PROG("drag")
@@ -54,6 +71,23 @@
min: 18 68;
parts {
part {
+ name: "clip";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ to: "trough";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ to: "trough";
+ }
+ }
+ }
+ part {
name: "trough";
description {
state: "default" 0.0;
@@ -87,10 +121,10 @@
}
}
}
- SCROLLBAR_DRAG("drag", 16, 20, 0, 1, "scrollbar_vdrag1.png",
"scrollbar_vdrag2.png", "scrollbar_vdrag_thumb.png")
- SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, 0,
"scrollbar_button_up1.png", "scrollbar_button_up2.png")
- SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -33,
"scrollbar_button_up1.png", "scrollbar_button_up2.png")
- SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -17,
"scrollbar_button_down1.png", "scrollbar_button_down2.png")
+ SCROLLBAR_DRAG("drag", 16, 20, 0, 1, "scrollbar_vdrag1.png",
"scrollbar_vdrag2.png", "scrollbar_vdrag_thumb.png", "clip")
+ SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, 0,
"scrollbar_button_up1.png", "scrollbar_button_up2.png", "clip")
+ SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -33,
"scrollbar_button_up1.png", "scrollbar_button_up2.png", "clip")
+ SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -17,
"scrollbar_button_down1.png", "scrollbar_button_down2.png", "clip")
}
programs {
SCROLLBAR_DRAG_PROG("drag")
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/slider.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- slider.edc 4 Dec 2005 14:54:56 -0000 1.2
+++ slider.edc 10 Jul 2006 03:26:53 -0000 1.3
@@ -106,7 +106,7 @@
programs {
program {
name: "hslider_drag_down";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
source: "drag";
action: STATE_SET "down" 0.0;
target: "drag";
@@ -245,7 +245,7 @@
programs {
program {
name: "vslider_drag_down";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
source: "drag";
action: STATE_SET "down" 0.0;
target: "drag";
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/spinner.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- spinner.edc 8 Feb 2006 12:49:38 -0000 1.1
+++ spinner.edc 10 Jul 2006 03:26:53 -0000 1.2
@@ -133,7 +133,7 @@
}
program {
name: "up_arrow_down";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
source: "up_arrow";
action: STATE_SET "down" 0.0;
target: "up_arrow";
@@ -147,7 +147,7 @@
}
program {
name: "down_arrow_down";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
source: "down_arrow";
action: STATE_SET "down" 0.0;
target: "down_arrow";
@@ -155,7 +155,7 @@
program {
name: "up_arrow_pressed";
source: "up_arrow";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
action: SIGNAL_EMIT "scroll_up_start" "";
}
program {
@@ -167,7 +167,7 @@
program {
name: "down_arrow_pressed";
source: "down_arrow";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
action: SIGNAL_EMIT "scroll_down_start" "";
}
program {
===================================================================
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- tree.edc 7 Apr 2006 15:36:10 -0000 1.16
+++ tree.edc 10 Jul 2006 03:26:53 -0000 1.17
@@ -352,7 +352,7 @@
}
program {
name: "tree_checkbox_down";
- signal: "mouse,down,1";
+ signal: "mouse,down,1*";
source: "checkbox";
action: STATE_SET "down" 0.0;
target: "checkbox_down";
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
