Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
button.edc check_button.edc entry.edc menu.edc paned.edc
radio_button.edc slider.edc statusbar.edc toggle_button.edc
tree.edc windows.edc
Log Message:
* [Etk_Image] Add etk_image_size_get(), etk_image_set_from_stock() and clean
the internal code
* [Etk_Slider] Fix the behavior of the drag part
* [Etk_Scrollbar] Fix the behavior of the drag part
* [Etk_Entry] Modify the theme of the foxused entry
* [Etk_Tree] The tree now uses "col models" to make it more generic. You can
also now load images or icons from an edje file. This breaks the API a bit!
* [Default theme] Use "smooth: 0" more often which improves a lot the resize
perfs
* [Etk_Filechooser] Enable it since it's now useable. Still needs some work
though
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/button.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- button.edc 2 Dec 2005 21:57:55 -0000 1.5
+++ button.edc 4 Dec 2005 14:54:56 -0000 1.6
@@ -21,6 +21,9 @@
normal: "button_up.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
@@ -227,7 +230,6 @@
name: "button_focus";
signal: "focus";
source: "";
- FOCUS_GLOW_ACTION
after: "button_focus_prog";
after: "go_active";
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/check_button.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- check_button.edc 2 Dec 2005 21:57:55 -0000 1.3
+++ check_button.edc 4 Dec 2005 14:54:56 -0000 1.4
@@ -42,6 +42,9 @@
image {
normal: "checkbox_off.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "on" 0.0;
@@ -67,6 +70,9 @@
image {
normal: "checkbox_down.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/entry.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entry.edc 1 Oct 2005 16:29:44 -0000 1.1
+++ entry.edc 4 Dec 2005 14:54:56 -0000 1.2
@@ -18,33 +18,9 @@
normal: "entry.png";
border: 8 8 8 8;
}
- }
- }
- /* 41 81 30 */
- part {
- name: "entry_focus";
- description {
- state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- rel1 {
- relative: 0.0 0.5;
- offset: 0 -9;
- }
- rel2 {
- relative: 1.0 0.5;
- offset: -1 8;
+ fill {
+ smooth: 0;
}
- image {
- normal: "entry_focus.png";
- border: 8 8 8 8;
- }
- }
- description {
- state: "focus" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
}
}
part {
@@ -64,23 +40,20 @@
}
}
}
+ FOCUS_GLOW(0.0, 0.0, -1, -1, "entry", 1.0, 1.0, 0, 0, "entry")
}
programs {
program {
name: "entry_focus";
signal: "focus";
source: "";
- action: STATE_SET "focus" 0.0;
- transition: LINEAR 0.2;
- target: "entry_focus";
+ FOCUS_GLOW_ACTION
}
program {
name: "button_unfocus";
signal: "unfocus";
source: "";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.2;
- target: "entry_focus";
+ UNFOCUS_GLOW_ACTION
}
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/menu.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- menu.edc 20 Nov 2005 10:33:28 -0000 1.3
+++ menu.edc 4 Dec 2005 14:54:56 -0000 1.4
@@ -60,6 +60,9 @@
border: 1 1 1 1;
middle: 0;
}
+ fill {
+ smooth: 0;
+ }
}
}
}
@@ -159,6 +162,9 @@
border: 8 8 8 8;
middle: 0;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
@@ -188,6 +194,9 @@
normal: "menu_item_shadow2.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
@@ -217,6 +226,9 @@
normal: "menu_item_shadow1.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
@@ -246,6 +258,9 @@
normal: "menu_item_highlight.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
@@ -606,6 +621,9 @@
image {
normal: "menu_bar.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
}
@@ -694,6 +712,9 @@
normal: "menu_item_shadow2.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
@@ -722,6 +743,9 @@
normal: "menu_item_shadow1.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
@@ -750,6 +774,9 @@
normal: "menu_item_highlight.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "active" 0.0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/paned.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- paned.edc 2 Nov 2005 13:53:37 -0000 1.3
+++ paned.edc 4 Dec 2005 14:54:56 -0000 1.4
@@ -40,6 +40,9 @@
image {
normal: "hpaned_handle.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
PANED_ARROW("left_arrow1", -27, 6, 20, 28, "handle", "left")
@@ -113,6 +116,9 @@
image {
normal: "vpaned_handle.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
PANED_ARROW("up_arrow1", 6, -27, 28, 20, "handle", "up")
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/radio_button.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- radio_button.edc 2 Dec 2005 21:57:55 -0000 1.3
+++ radio_button.edc 4 Dec 2005 14:54:56 -0000 1.4
@@ -42,6 +42,9 @@
image {
normal: "radio_off.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "on" 0.0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/slider.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- slider.edc 2 Dec 2005 22:10:52 -0000 1.1
+++ slider.edc 4 Dec 2005 14:54:56 -0000 1.2
@@ -18,6 +18,9 @@
normal: "hslider_bar.png";
border: 5 5 0 0;
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -53,6 +56,9 @@
normal: "hhandle.png";
border: 10 10 0 0;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
@@ -80,6 +86,9 @@
image {
normal: "hhandle_thumb.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
@@ -148,6 +157,9 @@
normal: "vslider_bar.png";
border: 0 0 5 5;
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -183,6 +195,9 @@
normal: "vhandle.png";
border: 0 0 10 10;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
@@ -210,6 +225,9 @@
image {
normal: "vhandle_thumb.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/statusbar.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- statusbar.edc 20 Nov 2005 16:55:54 -0000 1.3
+++ statusbar.edc 4 Dec 2005 14:54:56 -0000 1.4
@@ -18,6 +18,9 @@
image {
normal: "status_bar.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -36,6 +39,9 @@
image {
normal: "status_resize.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "hidden" 0.0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/toggle_button.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- toggle_button.edc 2 Dec 2005 21:57:55 -0000 1.3
+++ toggle_button.edc 4 Dec 2005 14:54:56 -0000 1.4
@@ -21,6 +21,9 @@
normal: "button_up.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "down" 0.0;
@@ -332,13 +335,13 @@
{
activated = 1;
set_state(PART:"toggle_button", "on", 0.0);
- //set_state(PART:"swallow_area", "down", 0.0);
+ set_state(PART:"swallow_area", "down", 0.0);
}
public desactivate()
{
activated = 0;
set_state(PART:"toggle_button", "default", 0.0);
- //set_state(PART:"swallow_area", "default", 0.0);
+ set_state(PART:"swallow_area", "default", 0.0);
}
public up()
{
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- tree.edc 2 Dec 2005 21:57:55 -0000 1.6
+++ tree.edc 4 Dec 2005 14:54:56 -0000 1.7
@@ -4,7 +4,7 @@
item: "inset" "8 8 8 8";
item: "separator_color" "204 204 204 140";
item: "item_height" "24";
- item: "image_height" "20";
+ item: "cell_margins" "4 4 2 2";
item: "expander_size" "18";
}
parts {
@@ -24,6 +24,9 @@
normal: "tree_bg.png";
border: 8 8 8 8;
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -59,6 +62,9 @@
image {
normal: "e_watermark.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -77,60 +83,82 @@
normal: "tree_over.png";
border: 12 12 12 12;
}
+ fill {
+ smooth: 0;
+ }
}
}
+ FOCUS_GLOW(0.0, 0.0, -1, -1, "tree", 1.0, 1.0, 0, 0, "tree")
+ }
+ programs {
+ program {
+ name: "tree_focus";
+ signal: "focus";
+ source: "";
+ FOCUS_GLOW_ACTION
+ }
+ program {
+ name: "tree_unfocus";
+ signal: "unfocus";
+ source: "";
+ UNFOCUS_GLOW_ACTION
+ }
+ }
+}
+/*group {
+ name: "tree_row";
+ parts {
part {
- name: "focus";
- mouse_events: 0;
- clip_to: "tree_clip";
- description {
- state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
+ name: "row";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
rel1 {
relative: 0.0 0.0;
- offset: -1 -1;
+ offset: 0 0;
}
rel2 {
relative: 1.0 1.0;
- offset: 0 0;
+ offset: -1 -1;
}
- image {
- normal: "focus_glow.png";
- border: 7 7 7 7;
- middle: 0;
- }
- fill {
- smooth: 0;
- }
- }
- description {
- state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
+ }
+ description {
+ state: "even" 0.0;
+ inherit: "default" 0.0;
+ color: 190 190 190 40;
+ }
+ description {
+ state: "selected" 0.0;
+ inherit: "default" 0.0;
+ color: 219 181 104 60;
+ }
}
}
programs {
program {
- name: "tree_focus";
- signal: "focus";
+ name: "even";
+ signal: "even";
source: "";
- action: STATE_SET "focused" 0.0;
- transition: DECELERATE 0.2;
- target: "focus";
+ action: STATE_SET "even" 0.0;
+ target: "row";
}
program {
- name: "tree_unfocus";
- signal: "unfocus";
+ name: "odd";
+ signal: "odd";
source: "";
action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.5;
- target: "focus";
+ target: "row";
+ }
+ program {
+ name: "selected";
+ signal: "selected";
+ source: "";
+ action: STATE_SET "selected" 0.0;
+ target: "row";
}
}
-}
+}*/
group {
name: "tree_row";
parts {
@@ -151,6 +179,9 @@
normal: "tree_row_odd.png";
border: 3 3 3 3;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "even" 0.0;
@@ -233,6 +264,9 @@
image {
normal: "tree_expander_fold.png";
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "expand" 0.0;
@@ -240,6 +274,9 @@
image {
normal: "tree_expander_unfold.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
}
@@ -282,6 +319,9 @@
normal: "tree_header_inactive.png";
border: 2 2 0 3;
}
+ fill {
+ smooth: 0;
+ }
}
description {
state: "over" 0.0;
@@ -289,6 +329,9 @@
image {
normal: "tree_header_active.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/windows.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- windows.edc 2 Dec 2005 21:57:55 -0000 1.6
+++ windows.edc 4 Dec 2005 14:54:56 -0000 1.7
@@ -38,6 +38,9 @@
image {
normal: "e_watermark.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -58,6 +61,9 @@
border: 1 1 1 1;
middle: 0;
}
+ fill {
+ smooth: 0;
+ }
}
}
}
@@ -103,6 +109,9 @@
image {
normal: "e_watermark.png";
}
+ fill {
+ smooth: 0;
+ }
}
}
part {
@@ -123,6 +132,9 @@
border: 1 1 1 1;
middle: 0;
}
+ fill {
+ smooth: 0;
+ }
}
}
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
