Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
paned.edc scrollbar.edc
Log Message:
* Make the tree scrollable (vertically only for now). Still need to fix
some problems with the drag button size
* Fix some theme issues
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/paned.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- paned.edc 28 Oct 2005 17:08:26 -0000 1.2
+++ paned.edc 2 Nov 2005 13:53:37 -0000 1.3
@@ -1,6 +1,6 @@
group {
name: "hpaned";
- min: 8 60;
+ min: 7 60;
parts {
part {
name: "separator";
@@ -12,7 +12,7 @@
}
rel2 {
relative: 0.5 1.0;
- offset: 2 -1;
+ offset: 3 -1;
}
image {
normal: "hpaned_separator.png";
@@ -29,66 +29,28 @@
state: "default" 0.0;
rel1 {
relative: 0.5 0.5;
- offset: -9 -22;
+ offset: -2 -20;
to: "separator";
}
rel2 {
relative: 0.5 0.5;
- offset: 8 23;
+ offset: 1 21;
to: "separator";
}
image {
- normal: "vhandle.png";
- border: 0 0 10 10;
- }
- }
- description {
- state: "down" 0.0;
- inherit: "default" 0.0;
- image {
- normal: "vhandle_down.png";
- }
- }
- }
- part {
- name: "handle_thumb";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.5 0.5;
- offset: -4 -9;
- to: "handle";
- }
- rel2 {
- relative: 0.5 0.5;
- offset: 1 6;
- to: "handle";
- }
- image {
- normal: "vhandle_thumb.png";
- }
- }
- description {
- state: "down" 0.0;
- inherit: "default" 0.0;
- rel1 {
- offset: -3 -8;
- }
- rel2 {
- offset: 2 7;
+ normal: "hpaned_handle.png";
}
}
}
- PANED_ARROW("left_arrow1", -20, 8, 20, 28, "handle", "left")
- PANED_ARROW("left_arrow2", -40, 8, 20, 28, "handle", "left")
- PANED_ARROW("left_arrow3", -60, 8, 20, 28, "handle", "left")
- PANED_ARROW("left_arrow4", -80, 8, 20, 28, "handle", "left")
+ PANED_ARROW("left_arrow1", -27, 6, 20, 28, "handle", "left")
+ PANED_ARROW("left_arrow2", -47, 6, 20, 28, "handle", "left")
+ PANED_ARROW("left_arrow3", -67, 6, 20, 28, "handle", "left")
+ PANED_ARROW("left_arrow4", -87, 6, 20, 28, "handle", "left")
- PANED_ARROW("right_arrow1", 18, 8, 20, 28, "handle", "right")
- PANED_ARROW("right_arrow2", 38, 8, 20, 28, "handle", "right")
- PANED_ARROW("right_arrow3", 58, 8, 20, 28, "handle", "right")
- PANED_ARROW("right_arrow4", 78, 8, 20, 28, "handle", "right")
+ PANED_ARROW("right_arrow1", 6, 6, 20, 28, "handle", "right")
+ PANED_ARROW("right_arrow2", 26, 6, 20, 28, "handle", "right")
+ PANED_ARROW("right_arrow3", 46, 6, 20, 28, "handle", "right")
+ PANED_ARROW("right_arrow4", 66, 6, 20, 28, "handle", "right")
}
programs {
PANED_ARROWS_PROG("left")
@@ -106,22 +68,6 @@
source: "separator";
PANED_ARROWS_HIDE_ACTION("left", "right")
}
- program {
- name: "separator_down";
- signal: "mouse,down,1";
- source: "separator";
- action: STATE_SET "down" 0.0;
- target: "handle";
- target: "handle_thumb";
- }
- program {
- name: "separator_up";
- signal: "mouse,up,1";
- source: "separator";
- action: STATE_SET "default" 0.0;
- target: "handle";
- target: "handle_thumb";
- }
}
}
@@ -139,7 +85,7 @@
}
rel2 {
relative: 1.0 0.5;
- offset: -1 2;
+ offset: -1 3;
}
image {
normal: "vpaned_separator.png";
@@ -156,66 +102,28 @@
state: "default" 0.0;
rel1 {
relative: 0.5 0.5;
- offset: -22 -9;
+ offset: -20 -2;
to: "separator";
}
rel2 {
relative: 0.5 0.5;
- offset: 23 8;
+ offset: 21 1;
to: "separator";
}
image {
- normal: "hhandle.png";
- border: 10 10 0 0;
- }
- }
- description {
- state: "down" 0.0;
- inherit: "default" 0.0;
- image {
- normal: "hhandle_down.png";
- }
- }
- }
- part {
- name: "handle_thumb";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.5 0.5;
- offset: -9 -4;
- to: "handle";
- }
- rel2 {
- relative: 0.5 0.5;
- offset: 6 1;
- to: "handle";
- }
- image {
- normal: "hhandle_thumb.png";
- }
- }
- description {
- state: "down" 0.0;
- inherit: "default" 0.0;
- rel1 {
- offset: -8 -3;
- }
- rel2 {
- offset: 7 2;
+ normal: "vpaned_handle.png";
}
}
}
- PANED_ARROW("up_arrow1", 8, -20, 28, 20, "handle", "up")
- PANED_ARROW("up_arrow2", 8, -40, 28, 20, "handle", "up")
- PANED_ARROW("up_arrow3", 8, -60, 28, 20, "handle", "up")
- PANED_ARROW("up_arrow4", 8, -80, 28, 20, "handle", "up")
+ PANED_ARROW("up_arrow1", 6, -27, 28, 20, "handle", "up")
+ PANED_ARROW("up_arrow2", 6, -47, 28, 20, "handle", "up")
+ PANED_ARROW("up_arrow3", 6, -67, 28, 20, "handle", "up")
+ PANED_ARROW("up_arrow4", 6, -87, 28, 20, "handle", "up")
- PANED_ARROW("down_arrow1", 8, 18, 28, 20, "handle", "down")
- PANED_ARROW("down_arrow2", 8, 38, 28, 20, "handle", "down")
- PANED_ARROW("down_arrow3", 8, 58, 28, 20, "handle", "down")
- PANED_ARROW("down_arrow4", 8, 78, 28, 20, "handle", "down")
+ PANED_ARROW("down_arrow1", 6, 6, 28, 20, "handle", "down")
+ PANED_ARROW("down_arrow2", 6, 26, 28, 20, "handle", "down")
+ PANED_ARROW("down_arrow3", 6, 46, 28, 20, "handle", "down")
+ PANED_ARROW("down_arrow4", 6, 66, 28, 20, "handle", "down")
}
programs {
PANED_ARROWS_PROG("up")
@@ -233,21 +141,5 @@
source: "separator";
PANED_ARROWS_HIDE_ACTION("up", "down")
}
- program {
- name: "separator_down";
- signal: "mouse,down,1";
- source: "separator";
- action: STATE_SET "down" 0.0;
- target: "handle";
- target: "handle_thumb";
- }
- program {
- name: "separator_up";
- signal: "mouse,up,1";
- source: "separator";
- action: STATE_SET "default" 0.0;
- target: "handle";
- target: "handle_thumb";
- }
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/scrollbar.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- scrollbar.edc 31 Oct 2005 21:36:40 -0000 1.3
+++ scrollbar.edc 2 Nov 2005 13:53:37 -0000 1.4
@@ -8,11 +8,11 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.5;
- offset: 0 -8;
+ offset: 0 -9;
}
rel2 {
relative: 1.0 0.5;
- offset: -1 9;
+ offset: -1 8;
}
image {
normal: "hscrollbar_trough.png";
@@ -28,18 +28,18 @@
visible: 0;
rel1 {
relative: 0.0 0.5;
- offset: 16 10;
+ offset: 16 9;
}
rel2 {
relative: 1.0 0.5;
- offset: -33 10;
+ offset: -33 9;
}
}
}
SCROLLBAR_DRAG("drag", 20, 20, 1, 0, "scrollbar_hdrag_thumb.png")
- SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -1, -8,
"scrollbar_arrow_left.png")
- SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -34, -8,
"scrollbar_arrow_left.png")
- SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -18, -8,
"scrollbar_arrow_right.png")
+ SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -1, -9,
"scrollbar_arrow_left.png")
+ SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -34, -9,
"scrollbar_arrow_left.png")
+ SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -18, -9,
"scrollbar_arrow_right.png")
}
programs {
SCROLLBAR_BUTTON_PROG("left_left_arrow", "left")
@@ -58,11 +58,11 @@
state: "default" 0.0;
rel1 {
relative: 0.5 0.0;
- offset: -8 0;
+ offset: -9 0;
}
rel2 {
relative: 0.5 1.0;
- offset: 9 -1;
+ offset: 8 -1;
}
image {
normal: "vscrollbar_trough.png";
@@ -78,18 +78,18 @@
visible: 0;
rel1 {
relative: 0.5 0.0;
- offset: 10 16;
+ offset: 9 16;
}
rel2 {
relative: 0.5 1.0;
- offset: 10 -33;
+ offset: 9 -33;
}
}
}
SCROLLBAR_DRAG("drag", 20, 20, 0, 1, "scrollbar_vdrag_thumb.png")
- SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, -1,
"scrollbar_arrow_up.png")
- SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -34,
"scrollbar_arrow_down.png")
- SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -18,
"scrollbar_arrow_down.png")
+ SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -9, -1,
"scrollbar_arrow_up.png")
+ SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -9, -34,
"scrollbar_arrow_down.png")
+ SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -9, -18,
"scrollbar_arrow_down.png")
}
programs {
SCROLLBAR_BUTTON_PROG("up_up_arrow", "up")
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
