Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
button.edc check_button.edc radio_button.edc toggle_button.edc
tree.edc
Log Message:
* Fix the focus system
* A lot of work on the tree (expandable rows, selection, clip, image
cells...). It still needs some work though
* Clicking on the label of a radio/checkbutton now activates the button
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- button.edc 1 Oct 2005 16:29:44 -0000 1.1
+++ button.edc 7 Oct 2005 21:33:42 -0000 1.2
@@ -105,7 +105,7 @@
color: 255 255 255 0;
align: 1.0 0.5;
max: 0 0;
- //fixed: 1 1;
+ fixed: 1 1;
rel1 {
relative: 0.0 0.0;
offset: 3 3;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/check_button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- check_button.edc 1 Oct 2005 16:29:44 -0000 1.1
+++ check_button.edc 7 Oct 2005 21:33:42 -0000 1.2
@@ -6,6 +6,28 @@
}
parts {
part {
+ name: "bg";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ description {
+ state: "over" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 200;
+ }
+ }
+ part {
name: "checkbox";
description {
state: "default" 0.0;
@@ -95,5 +117,19 @@
source: "";
UNFOCUS_ACTION
}
+ program {
+ name: "check_button_enter";
+ signal: "enter";
+ source: "";
+ action: STATE_SET "over" 0.0;
+ target: "bg";
+ }
+ program {
+ name: "check_button_leave";
+ signal: "leave";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "bg";
+ }
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/radio_button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- radio_button.edc 1 Oct 2005 16:29:44 -0000 1.1
+++ radio_button.edc 7 Oct 2005 21:33:42 -0000 1.2
@@ -6,6 +6,28 @@
}
parts {
part {
+ name: "bg";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ description {
+ state: "over" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 200;
+ }
+ }
+ part {
name: "radio";
description {
state: "default" 0.0;
@@ -58,5 +80,19 @@
source: "";
UNFOCUS_ACTION
}
+ program {
+ name: "radio_button_enter";
+ signal: "enter";
+ source: "";
+ action: STATE_SET "over" 0.0;
+ target: "bg";
+ }
+ program {
+ name: "radio_button_leave";
+ signal: "leave";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "bg";
+ }
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/toggle_button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- toggle_button.edc 1 Oct 2005 16:29:44 -0000 1.1
+++ toggle_button.edc 7 Oct 2005 21:33:42 -0000 1.2
@@ -125,7 +125,7 @@
color: 255 255 255 0;
align: 1.0 0.5;
max: 0 0;
- //fixed: 1 1;
+ fixed: 1 1;
rel1 {
relative: 0.0 0.0;
offset: 3 3;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- tree.edc 1 Oct 2005 16:29:44 -0000 1.1
+++ tree.edc 7 Oct 2005 21:33:42 -0000 1.2
@@ -1,11 +1,14 @@
group {
name: "tree";
data {
- item: "inset" "7 7 7 7";
+ item: "inset" "12 8 12 8";
item: "separator_color" "204 204 204 255";
item: "row_color1" "255 255 255 255";
item: "row_color2" "245 245 245 255";
+ item: "row_selected_color" "219 181 104 255";
item: "item_height" "24";
+ item: "image_height" "20";
+ item: "expander_size" "18";
}
parts {
part {
@@ -26,6 +29,69 @@
}
}
}
+ part {
+ name: "tree2";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ image {
+ normal: "tree_over.png";
+ border: 12 12 12 12;
+ }
+ }
+ }
+ }
+}
+group {
+ name: "tree_expander";
+ parts {
+ part {
+ name: "expander_arrow";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ image {
+ normal: "tree_expander_fold.png";
+ }
+ }
+ description {
+ state: "expand" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "tree_expander_unfold.png";
+ }
+ }
+ }
+ }
+ programs {
+ program {
+ name: "collapse";
+ signal: "collapse";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "expander_arrow";
+ }
+ program {
+ name: "expand";
+ signal: "expand";
+ source: "";
+ action: STATE_SET "expand" 0.0;
+ target: "expander_arrow";
+ }
}
}
group {
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
