From: <enl...@li...> - 2004-01-27 06:13:44
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_tree.c ewl_tree.h Log Message: Actually use text widgets on ewl_tree_text_row_add(); Added an ewl_tree_entry_row_add() to make a row of entries (how _text_row_add used to be) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_tree.c 14 Jan 2004 20:42:54 -0000 1.32 +++ ewl_tree.c 26 Jan 2004 02:46:48 -0000 1.33 @@ -214,6 +214,43 @@ Ewl_Widget *ewl_tree_add_text_row(Ewl_Tree *tree, Ewl_Row *prow, char **text) { int i; + Ewl_Widget **texts; + Ewl_Widget *row; + + DENTER_FUNCTION(DLEVEL_STABLE); + + DCHECK_PARAM_PTR_RET("tree", tree, NULL); + + texts = NEW(Ewl_Widget *, tree->ncols); + if (!texts) + DRETURN_PTR(NULL, DLEVEL_STABLE); + + for (i = 0; i < tree->ncols; i++) { + if (text) + texts[i] = ewl_text_new(text[i]); + else + texts[i] = ewl_text_new(NULL); + ewl_widget_show(texts[i]); + } + + row = ewl_tree_add_row(tree, prow, texts); + + FREE(texts); + + DRETURN_PTR(row, DLEVEL_STABLE); +} + +/** + * @param tree: the tree to hold the new entry row + * @param prow: the parent row of the new entry row + * @param text: the array of strings that hold the entry text to be added + * @brief Add a row of text entries to a tree + * + * @return Returns a pointer to a new row on success, NULL on failure. + */ +Ewl_Widget *ewl_tree_add_entry_row(Ewl_Tree *tree, Ewl_Row *prow, char **text) +{ + int i; Ewl_Widget **entries; Ewl_Widget *row; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_tree.h 14 Jan 2004 20:42:54 -0000 1.17 +++ ewl_tree.h 26 Jan 2004 02:46:48 -0000 1.18 @@ -84,6 +84,7 @@ Ewl_Widget *ewl_tree_add_row(Ewl_Tree *tree, Ewl_Row *prow, Ewl_Widget **children); Ewl_Widget *ewl_tree_add_text_row(Ewl_Tree *tree, Ewl_Row *prow, char **text); +Ewl_Widget *ewl_tree_add_entry_row(Ewl_Tree *tree, Ewl_Row *prow, char **text); void ewl_tree_destroy_row(Ewl_Tree *tree, Ewl_Row *row); void ewl_tree_set_row_expand(Ewl_Row *row, Ewl_Tree_Node_Flags expanded); |
From: <enl...@li...> - 2004-02-17 17:34:04
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_enums.h Log Message: SAVE not CLOSE! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_enums.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- ewl_enums.h 14 Feb 2004 07:19:58 -0000 1.45 +++ ewl_enums.h 17 Feb 2004 17:25:11 -0000 1.46 @@ -208,7 +208,7 @@ enum Ewl_Filedialog_Type { EWL_FILEDIALOG_TYPE_OPEN, - EWL_FILEDIALOG_TYPE_CLOSE + EWL_FILEDIALOG_TYPE_SAVE }; /** |
From: <enl...@li...> - 2004-02-17 17:58:33
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_fileselector.c Log Message: strdup strings exposed to API calls. this fixes a filedialog segv =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_fileselector.c 17 Feb 2004 05:18:38 -0000 1.32 +++ ewl_fileselector.c 17 Feb 2004 17:49:39 -0000 1.33 @@ -128,8 +128,8 @@ char *ewl_fileselector_get_filename (Ewl_Fileselector *fs) { DENTER_FUNCTION(DLEVEL_STABLE); - - DRETURN_PTR(fs->item, DLEVEL_STABLE); + printf("item: %s\n", fs->item); + DRETURN_PTR(fs->item ? strdup(fs->item) : NULL, DLEVEL_STABLE); } /** @@ -140,8 +140,8 @@ char *ewl_fileselector_get_path (Ewl_Fileselector *fs) { DENTER_FUNCTION(DLEVEL_STABLE); - - DRETURN_PTR(fs->path, DLEVEL_STABLE); + printf("fs path: %s\n", fs->path); + DRETURN_PTR(fs->path ? strdup(fs->path) : NULL, DLEVEL_STABLE); } @@ -208,6 +208,7 @@ ewl_container_reset (EWL_CONTAINER (fs->dirs)); ewl_container_reset (EWL_CONTAINER (fs->files)); + printf("set dir: %s\n", path); fs->path = strdup (path); while (num--) { |
From: <enl...@li...> - 2004-02-17 18:02:41
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_filedialog.c ewl_fileselector.c Log Message: free the now strdup'd path get rid of some debug gibberish =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- ewl_filedialog.c 17 Feb 2004 05:18:38 -0000 1.31 +++ ewl_filedialog.c 17 Feb 2004 17:53:47 -0000 1.32 @@ -176,17 +176,17 @@ void ewl_filedialog_change_labels_cb (Ewl_Widget * w, void *ev_data, void *user_data) { - char *ptr; + char *path; char str[PATH_MAX + 50]; Ewl_Filedialog *fd = user_data; DENTER_FUNCTION(DLEVEL_STABLE); if (!ev_data) { - ptr = ewl_fileselector_get_path (EWL_FILESELECTOR (fd->selector)); - - snprintf (str, sizeof (str), "Current dir: %s", ptr); + path = ewl_fileselector_get_path (EWL_FILESELECTOR (fd->selector)); + snprintf (str, sizeof (str), "Current dir: %s", path); + free(path); ewl_text_set_text (EWL_TEXT (fd->path_label), str); } else { @@ -222,7 +222,6 @@ path1 = ewl_fileselector_get_path(EWL_FILESELECTOR(fd->selector)); path2 = ewl_entry_get_text(EWL_ENTRY(fd->entry)); snprintf(tmp, PATH_MAX, "%s/%s", path1, path2); - free(path1); free(path2); path1 = strdup(tmp); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- ewl_fileselector.c 17 Feb 2004 17:49:39 -0000 1.33 +++ ewl_fileselector.c 17 Feb 2004 17:53:47 -0000 1.34 @@ -128,7 +128,6 @@ char *ewl_fileselector_get_filename (Ewl_Fileselector *fs) { DENTER_FUNCTION(DLEVEL_STABLE); - printf("item: %s\n", fs->item); DRETURN_PTR(fs->item ? strdup(fs->item) : NULL, DLEVEL_STABLE); } @@ -140,7 +139,6 @@ char *ewl_fileselector_get_path (Ewl_Fileselector *fs) { DENTER_FUNCTION(DLEVEL_STABLE); - printf("fs path: %s\n", fs->path); DRETURN_PTR(fs->path ? strdup(fs->path) : NULL, DLEVEL_STABLE); } @@ -208,7 +206,6 @@ ewl_container_reset (EWL_CONTAINER (fs->dirs)); ewl_container_reset (EWL_CONTAINER (fs->files)); - printf("set dir: %s\n", path); fs->path = strdup (path); while (num--) { |
From: <enl...@li...> - 2004-02-17 22:53:20
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_filedialog.c Log Message: Update the filedialog's entry when someone clicks on a file. Send the filename instead of just the path to the value changed cb. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_filedialog.c 17 Feb 2004 17:53:47 -0000 1.32 +++ ewl_filedialog.c 17 Feb 2004 22:44:11 -0000 1.33 @@ -176,7 +176,7 @@ void ewl_filedialog_change_labels_cb (Ewl_Widget * w, void *ev_data, void *user_data) { - char *path; + char *path, *ptr = NULL; char str[PATH_MAX + 50]; Ewl_Filedialog *fd = user_data; @@ -186,8 +186,22 @@ path = ewl_fileselector_get_path (EWL_FILESELECTOR (fd->selector)); snprintf (str, sizeof (str), "Current dir: %s", path); - free(path); + free(path); ewl_text_set_text (EWL_TEXT (fd->path_label), str); + + path = ewl_fileselector_get_filename(EWL_FILESELECTOR(fd->selector)); + if (!path) return; + ptr = strrchr(path, '/'); + /* if we have a file */ + if (ptr) + { + ptr++; + ewl_entry_set_text (EWL_ENTRY(fd->entry), ptr); + } + /* if we just changed dirs, then clear it out */ + else + ewl_entry_set_text (EWL_ENTRY(fd->entry), ""); + free(path); } else { ewl_filedialog_ok_cb(w, NULL, fd); |
From: <enl...@li...> - 2004-02-21 06:44:52
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes Modified Files: default.edc Log Message: clean up winter theme a bit. still lots of work to be done... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- default.edc 27 Jan 2004 06:06:35 -0000 1.1 +++ default.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -1,15 +1,14 @@ +#include "default/bits/button-macro.edc" fonts { font: "default/fonts/Vera.ttf" "Vera"; } images { -#include "default/bits/button-images.edc" -#include "default/bits/checkbox-images.edc" +#include "default/bits/images.edc" #include "default/bits/entry-images.edc" #include "default/bits/filedialog-images.edc" #include "default/bits/misc-images.edc" #include "default/bits/progressbar-images.edc" -#include "default/bits/radio-images.edc" #include "default/bits/scrollbar-images.edc" #include "default/bits/window-images.edc" } @@ -30,7 +29,7 @@ item, "/filedialog/group" "filedialog"; item, "/hscrollbar/button_decrement/group" "hscroll-left"; item, "/hscrollbar/button_increment/group" "hscroll-right"; - item, "/hseeker/group" "trough"; + item, "/hseeker/group" "htrough"; item, "/hseparator/group" "hline"; item, "/imenu/group" "dialog"; item, "/notebook/tab_button/label/font" "Vera"; @@ -52,7 +51,8 @@ item, "/tree/group" "tree"; item, "/vscrollbar/button_decrement/group" "vscroll-down"; item, "/vscrollbar/button_increment/group" "vscroll-up"; - item, "/vseeker/group" "trough"; + item, "/vseeker/group" "vtrough"; + item, "/vseeker/button/group" "vbutton"; item, "/vseparator/group" "vline"; item, "/window/group" "window"; item, "/button/label/font_size" "10"; @@ -70,6 +70,7 @@ collections { #include "default/bits/button-groups.edc" #include "default/bits/checkbox-groups.edc" +#if 1 #include "default/bits/entry-groups.edc" #include "default/bits/filedialog-groups.edc" #include "default/bits/misc-groups.edc" @@ -77,4 +78,5 @@ #include "default/bits/radio-groups.edc" #include "default/bits/scrollbar-groups.edc" #include "default/bits/window-groups.edc" +#endif } |
From: <enl...@li...> - 2004-02-21 06:44:53
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/default/bits/images Modified Files: arrow-down.png arrow-left.png arrow-right.png arrow-up.png Added Files: arrow-combo.png arrow-sm-dn.png arrow-sm-up.png border-bevel.png border-radio.png border-rounded.png border-square.png gradient-dn.png gradient-hor-dn.png gradient-hor-up.png gradient-round-dn.png gradient-round-up.png gradient-up.png Log Message: clean up winter theme a bit. still lots of work to be done... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/images/arrow-down.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsXTkln5 and /tmp/cvsvAyN8r differ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/images/arrow-left.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsSknBOD and /tmp/cvsh7W3X0 differ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/images/arrow-right.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsCsUQHA and /tmp/cvsOyLyVX differ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/images/arrow-up.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsJhl3OH and /tmp/cvs8gmn74 differ |
From: <enl...@li...> - 2004-02-21 06:44:55
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/default/bits Modified Files: button-groups.edc button-images.edc button-programs.edc checkbox-groups.edc checkbox-programs.edc entry-groups.edc radio-groups.edc radio-images.edc scrollbar-groups.edc Added Files: button-macro.edc images.edc radio-programs.edc Log Message: clean up winter theme a bit. still lots of work to be done... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/button-groups.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- button-groups.edc 27 Jan 2004 06:04:53 -0000 1.1 +++ button-groups.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -11,60 +11,30 @@ item, "pad/bottom" "0"; } parts { - part { - name, "base"; - mouse_events, 0; - description { - state, "default" 0.0; - border, 3 3 3 3; - min, 6 6 6 6; - color_class, "background"; - rel1 { - relative, 0.0 0.0; - offset, 0 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "button-up.png"; - } - } - description { - state, "over" 0.0; - border, 3 3 3 3; - color_class, "highlight"; - color, 200 208 216 128; - rel1 { - relative, 0.0 0.0; - offset, 0 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "button-up.png"; - } - } - description { - state, "clicked" 0.0; - border, 3 3 3 3; - min, 6 6 6 6; - rel1 { - relative, 0.0 0.0; - offset, 0 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "button-clicked.png"; - } - } - } +BUTTON() + } + programs { +BUTTON_PROG() + } + } + + /* a button with horizontal gradient */ + group { + name, "vbutton"; + data { + item, "inset/left" "5"; + item, "inset/right" "5"; + item, "inset/top" "3"; + item, "inset/bottom" "3"; + item, "pad/left" "0"; + item, "pad/right" "0"; + item, "pad/top" "0"; + item, "pad/bottom" "0"; + } + parts { +BUTTON_H() + } + programs { +BUTTON_PROG() } -#include "button-programs.edc" } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/button-images.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- button-images.edc 27 Jan 2004 06:04:53 -0000 1.1 +++ button-images.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -3,3 +3,9 @@ image, "button-clicked.png" LOSSY 98; image, "radio.png" LOSSY 98; image, "radio-on.png" LOSSY 98; + +image, "border-square.png" LOSSY 98; +image, "border-radio.png" LOSSY 98; +image, "gradient-up.png" LOSSY 98; +image, "gradient-dn.png" LOSSY 98; + =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/button-programs.edc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- button-programs.edc 19 Feb 2004 21:47:34 -0000 1.3 +++ button-programs.edc 21 Feb 2004 06:33:14 -0000 1.4 @@ -1,18 +1,32 @@ programs { +/* program { name, "normal"; signal, "mouse,out"; source, "*"; action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; + transition, DECELERATE, 0.25; + //transition, LINEAR, 0.0; target, "base"; } + program { name, "hilited"; signal, "mouse,in"; source, "*"; action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; + //transition, LINEAR, 0.0; + transition, DECELERATE, 0.25; + target, "base"; + } + + program { + name, "unhilight"; + signal, "mouse,out"; + source, "*"; + action, STATE_SET "default" 0.0; + transition, DECELERATE, 0.25; + //transition, LINEAR, 0.0; target, "base"; } program { @@ -23,4 +37,14 @@ transition, LINEAR, 0.0; target, "base"; } + program { + name, "unclick"; + signal, "mouse,up,*"; + source, "*"; + action, STATE_SET "over" 0.0; + transition, LINEAR, 0.0; + target, "base"; + } +*/ +BUTTON_PROG() } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/checkbox-groups.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- checkbox-groups.edc 27 Jan 2004 06:04:53 -0000 1.1 +++ checkbox-groups.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -9,12 +9,12 @@ parts { part { name, "base"; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; border, 3 3 3 3; - min, 10 10; - max, 10 10; + min, 8 8; + max, 8 8; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -24,14 +24,15 @@ offset, -1 -1; } image { - normal, "checkbox.png"; + normal, "gradient-up.png"; } } description { state, "over" 0.0; border, 3 3 3 3; - min, 10 10; - max, 10 10; + color, 229 239 255 255; + min, 8 8; + max, 8 8; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -41,14 +42,15 @@ offset, -1 -1; } image { - normal, "checkbox-over.png"; + normal, "gradient-up.png"; } } description { state, "clicked" 0.0; border, 3 3 3 3; - min, 10 10; - max, 10 10; + min, 8 8; + max, 8 8; + color, 229 239 255 255; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -58,11 +60,32 @@ offset, -1 -1; } image { - normal, "checkbox.png"; + normal, "gradient-dn.png"; } } } + part { + name, "border"; + mouse_events, 0; + description { + state, "default" 0.0; + border, 3 3 3 3; + min, 10 10; + max, 10 10; + rel1 { + relative, 0.0 0.0; + offset, 0 0; + } + rel2 { + relative, 1.0 1.0; + offset, -1 -1; + } + image { + normal, "border-square.png"; + } + } + } part { name, "check"; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/checkbox-programs.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- checkbox-programs.edc 28 Jan 2004 05:09:30 -0000 1.2 +++ checkbox-programs.edc 21 Feb 2004 06:33:14 -0000 1.3 @@ -5,7 +5,6 @@ source, "*"; action, STATE_SET "default" 0.0; transition, LINEAR, 0.0; - target, "base"; target, "check"; } program { @@ -13,7 +12,15 @@ signal, "mouse,in"; source, "*"; action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; + transition, DECELERATE, 0.25; + target, "base"; + } + program { + name, "unhilite"; + signal, "mouse,out"; + source, "*"; + action, STATE_SET "default" 0.0; + transition, DECELERATE, 0.25; target, "base"; } program { @@ -23,7 +30,16 @@ action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.0; target, "base"; - target, "check"; + target, "check"; + } + program { + name, "unclick"; + signal, "mouse,up,*"; + source, "*"; + action, STATE_SET "hilited" 0.0; + transition, LINEAR, 0.0; + target, "base"; + target, "check"; } program { name, "checked"; @@ -31,7 +47,6 @@ source, "*"; action, STATE_SET "checked" 0.0; transition, LINEAR, 0.0; - target, "base"; target, "check"; } } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/entry-groups.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- entry-groups.edc 27 Jan 2004 06:04:53 -0000 1.1 +++ entry-groups.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -8,7 +8,26 @@ } parts { part { - name, "background"; + name, "base"; + mouse_events, 0; + description { + state, "default" 0.0; + border, 3 3 3 3; + rel1 { + relative, 0.0 0.0; + offset, 0 0; + } + rel2 { + relative, 1.0 1.0; + offset, -1 -1; + } + image { + normal, "gradient-dn.png"; + } + } + } + part { + name, "base"; mouse_events, 0; description { state, "default" 0.0; @@ -22,7 +41,7 @@ offset, -1 -1; } image { - normal, "entry-base.png"; + normal, "border-square.png"; } } } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/radio-groups.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- radio-groups.edc 29 Jan 2004 14:29:49 -0000 1.2 +++ radio-groups.edc 21 Feb 2004 06:33:14 -0000 1.3 @@ -9,12 +9,12 @@ parts { part { name, "base"; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; border, 3 3 3 3; - min, 10 10; - max, 10 10; + min, 8 8; + max, 8 8; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -24,14 +24,15 @@ offset, -1 -1; } image { - normal, "radio.png"; + normal, "gradient-round-up.png"; } } description { state, "over" 0.0; border, 3 3 3 3; - min, 10 10; - max, 10 10; + min, 8 8; + max, 8 8; + color, 229 239 255 255; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -41,14 +42,15 @@ offset, -1 -1; } image { - normal, "radio-over.png"; + normal, "gradient-round-up.png"; } } description { state, "clicked" 0.0; border, 3 3 3 3; - min, 10 10; - max, 10 10; + min, 8 8; + max, 8 8; + color, 229 239 255 255; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -58,13 +60,35 @@ offset, -1 -1; } image { - normal, "radio.png"; + normal, "gradient-round-dn.png"; } } } part { + name, "border"; + mouse_events, 0; + description { + state, "default" 0.0; + border, 4 5 4 5; + min, 10 10; + max, 10 10; + rel1 { + relative, 0.0 0.0; + offset, 0 0; + } + rel2 { + relative, 1.0 1.0; + offset, -1 -1; + } + image { + normal, "border-radio.png"; + } + } + } + + part { name, "dot"; mouse_events, 0; description { @@ -106,42 +130,5 @@ } } - - programs { - program { - name, "normal"; - signal, "default"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - target, "dot"; - } - program { - name, "hilited"; - signal, "mouse,in"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "mouse,down,*"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - target, "dot"; - } - program { - name, "checked"; - signal, "checked"; - source, "*"; - action, STATE_SET "checked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - target, "dot"; - } - } +#include "radio-programs.edc" } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/radio-images.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- radio-images.edc 27 Jan 2004 06:04:54 -0000 1.1 +++ radio-images.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -1,3 +1,4 @@ -image, "radio.png" LOSSY 98; -image, "radio-over.png" LOSSY 98; image, "dot.png" LOSSY 98; +image, "border-radio.png" LOSSY 98; +image, "gradient-round-up.png" LOSSY 98; +image, "gradient-round-dn.png" LOSSY 98; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/scrollbar-groups.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- scrollbar-groups.edc 27 Jan 2004 06:04:54 -0000 1.1 +++ scrollbar-groups.edc 21 Feb 2004 06:33:14 -0000 1.2 @@ -1,65 +1,16 @@ group { name, "vscroll-up"; - min, 14 12; - max, 14 12; + min, 14 14; + max, 14 14; parts { - part { - name, "base"; - mouse_events, 1; - description { - state, "default" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 0; - } - image { - normal, "vscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 0; - } - image { - normal, "vscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 0; - } - image { - normal, "vscroll-button-clicked.png"; - } - } - } - +BUTTON_H() part { name, "arrow"; mouse_events, 1; description { state, "default" 0.0; - min, 10 9; - max, 10 9; + min, 8 7; + max, 8 7; rel1 { relative, 0.0 0.0; offset, 0 1; @@ -73,34 +24,13 @@ } } } + } - programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } +BUTTON_PROG() } +//#include "button-programs.edc" + } // end vscroll-up group { @@ -108,56 +38,7 @@ min, 12 10; max, 12 10; parts { - part { - name, "base"; - mouse_events, 1; - description { - state, "default" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 0; - } - image { - normal, "vscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 0; - } - image { - normal, "vscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 0; - } - image { - normal, "vscroll-button-clicked.png"; - } - } - } - + BUTTON_H() part { name, "arrow"; mouse_events, 1; @@ -179,32 +60,9 @@ } programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } + BUTTON_PROG() } - } // end vscroll-up + } // end vscroll-mini-up group { @@ -212,63 +70,14 @@ min, 14 13; max, 14 13; parts { - part { - name, "base"; - mouse_events, 1; - description { - state, "default" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "vscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "vscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "vscroll-button-clicked.png"; - } - } - } - + BUTTON_H() part { name, "arrow"; mouse_events, 1; description { state, "default" 0.0; - min, 10 9; - max, 10 9; + min, 8 7; + max, 8 7; rel1 { relative, 0.0 0.0; offset, 0 0; @@ -285,88 +94,16 @@ } programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } + BUTTON_PROG() } - } // end vscroll-dn + } // end vscroll-down group { name, "vscroll-mini-down"; min, 12 10; max, 12 10; parts { - part { - name, "base"; - mouse_events, 1; - description { - state, "default" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "vscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "vscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, 0 -1; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "vscroll-button-clicked.png"; - } - } - } - + BUTTON_H() part { name, "arrow"; mouse_events, 1; @@ -388,95 +125,23 @@ } programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } + BUTTON_PROG() } - } // end vscroll-dn + } // end vscroll-mini-down group { name, "hscroll-left"; - min, 12 14; - max, 12 14; + min, 13 14; + max, 13 14; parts { - part { - name, "base"; - mouse_events, 1; - description { - state, "default" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, 0 -1; - } - image { - normal, "hscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, 0 -1; - } - image { - normal, "hscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, 0 -1; - } - image { - normal, "hscroll-button-clicked.png"; - } - } - } - + BUTTON() part { name, "arrow"; mouse_events, 1; description { state, "default" 0.0; - min, 9 10; - max, 9 10; + min, 7 8; + max, 7 8; rel1 { relative, 0.0 0.0; offset, 1 0; @@ -493,30 +158,7 @@ } programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } + BUTTON_PROG() } } // end hscroll-left @@ -525,56 +167,7 @@ min, 10 12; max, 10 12; parts { - part { - name, "base"; - mouse_events, 1; - description { - state, "default" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, 0 -1; - } - image { - normal, "hscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, 0 -1; - } - image { - normal, "hscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, 0 -1; - } - image { - normal, "hscroll-button-clicked.png"; - } - } - } - + BUTTON() part { name, "arrow"; mouse_events, 1; @@ -596,30 +189,7 @@ } programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } + BUTTON_PROG() } } // end hscroll-left @@ -629,70 +199,52 @@ min, 13 14; max, 13 14; parts { + BUTTON() part { - name, "base"; + name, "arrow"; mouse_events, 1; description { state, "default" 0.0; - border, 2 2 2 2; + min, 7 8; + max, 7 8; rel1 { relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "hscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "hscroll-button-over.png"; - } - } - description { - state, "clicked" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; + offset, 1 0; } rel2 { relative, 1.0 1.0; offset, -1 -1; } image { - normal, "hscroll-button-clicked.png"; + normal, "arrow-right.png"; } } } - + } + + programs { + BUTTON_PROG() + } + } // end hscroll-right + + group { + name, "hscroll-mini-right"; + min, 10 12; + max, 10 12; + parts { + BUTTON() part { name, "arrow"; mouse_events, 1; description { state, "default" 0.0; - min, 9 10; - max, 9 10; rel1 { relative, 0.0 0.0; - offset, 1 0; + offset, 2 1; } rel2 { relative, 1.0 1.0; - offset, -1 -1; + offset, -2 -2; } image { normal, "arrow-right.png"; @@ -702,37 +254,13 @@ } programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } + BUTTON_PROG() } } // end hscroll-right group { - name, "hscroll-mini-right"; - min, 10 12; - max, 10 12; + name, "htrough"; + min, 14 14; parts { part { name, "base"; @@ -741,34 +269,25 @@ state, "default" 0.0; border, 2 2 2 2; rel1 { + to, "border"; relative, 0.0 0.0; - offset, -1 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } - image { - normal, "hscroll-button.png"; - } - } - description { - state, "over" 0.0; - border, 2 2 2 2; - rel1 { - relative, 0.0 0.0; - offset, -1 0; + offset, 1 1; } rel2 { + to, "border"; relative, 1.0 1.0; - offset, -1 -1; + offset, -2 -2; } image { - normal, "hscroll-button-over.png"; + normal, "gradient-dn.png"; } } + } + part { + name, "border"; + mouse_events, 1; description { - state, "clicked" 0.0; + state, "default" 0.0; border, 2 2 2 2; rel1 { relative, 0.0 0.0; @@ -776,82 +295,57 @@ } rel2 { relative, 1.0 1.0; - offset, -1 -1; + offset, 0 -1; } image { - normal, "hscroll-button-clicked.png"; + normal, "border-square.png"; } } } - + } + } // end trough + + group { + name, "vtrough"; + min, 14 14; + parts { part { - name, "arrow"; + name, "base"; mouse_events, 1; description { state, "default" 0.0; + border, 2 2 2 2; rel1 { + to, "border"; relative, 0.0 0.0; - offset, 2 1; + offset, 1 1; } rel2 { + to, "border"; relative, 1.0 1.0; offset, -2 -2; } image { - normal, "arrow-right.png"; + normal, "gradient-hor-dn.png"; } } } - } - - programs { - program { - name, "normal"; - signal, "normal"; - source, "*"; - action, STATE_SET "default" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "hilited"; - signal, "hilited"; - source, "*"; - action, STATE_SET "over" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - program { - name, "clicked"; - signal, "clicked"; - source, "*"; - action, STATE_SET "clicked" 0.0; - transition, LINEAR, 0.0; - target, "base"; - } - } - } // end hscroll-right - - group { - name, "trough"; - min, 14 14; - parts { part { - name, "base"; + name, "border"; mouse_events, 1; description { state, "default" 0.0; border, 2 2 2 2; rel1 { relative, 0.0 0.0; - offset, 0 0; + offset, 0 -1; } rel2 { relative, 1.0 1.0; - offset, -1 -1; + offset, -1 0; } image { - normal, "scroll-trough.png"; + normal, "border-square.png"; } } } |
From: <enl...@li...> - 2004-02-21 06:52:26
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/default/bits Modified Files: Makefile.am Log Message: don't build the individual eet's anymore =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/bits/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 8 Dec 2003 20:21:08 -0000 1.4 +++ Makefile.am 21 Feb 2004 06:40:48 -0000 1.5 @@ -14,10 +14,10 @@ CLEANFILES = $(EETS) themedir = $(pkgdatadir)/themes/default/bits -theme_DATA = $(EETS) +#theme_DATA = $(EETS) -all: $(EETS) +#all: $(EETS) -SUFFIXES = .edc .eet -.edc.eet: - edje_cc -v -id images $< $@ +#SUFFIXES = .edc .eet +#.edc.eet: +# edje_cc -v -id images $< $@ |
From: <enl...@li...> - 2004-02-27 16:56:16
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_widget.c Log Message: send mouse,up,# (# of button) instead of mouse,up on mouse up. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -3 -r1.105 -r1.106 --- ewl_widget.c 26 Feb 2004 05:38:41 -0000 1.105 +++ ewl_widget.c 27 Feb 2004 16:39:39 -0000 1.106 @@ -1317,11 +1317,16 @@ void ewl_widget_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data) { + Ewl_Event_Mouse_Up *e = ev_data; + char state[14]; + DENTER_FUNCTION(DLEVEL_STABLE); if (ewl_object_has_state(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) DRETURN(DLEVEL_STABLE); - ewl_widget_set_state(w, "mouse,up"); + snprintf(state, 14, "mouse,up,%i", e->button); + ewl_widget_set_state(w, state); + if (ewl_object_has_state(EWL_OBJECT(w), EWL_FLAG_STATE_HILITED)) { ewl_widget_set_state(w, "mouse,in"); ewl_callback_call_with_event_data(w, EWL_CALLBACK_CLICKED, |
From: <enl...@li...> - 2006-02-01 05:25:00
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_misc.c Log Message: typo... someone needs to compile before committing :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_misc.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- ewl_misc.c 31 Jan 2006 16:37:09 -0000 1.43 +++ ewl_misc.c 1 Feb 2006 05:24:50 -0000 1.44 @@ -555,7 +555,7 @@ else if (!strcmp(argv[i], "--ewl-fb")) { IF_FREE(ewl_config.evas.render_method); ewl_config.evas.render_method = strdup("fb"); - ewl_conifg.evas.engine = EWL_ENGINE_FB; + ewl_config.evas.engine = EWL_ENGINE_FB; matched++; } |
From: <enl...@li...> - 2006-02-01 05:43:54
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c Log Message: small improvement to window child sizing =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ewl_window.c 31 Jan 2006 16:37:09 -0000 1.28 +++ ewl_window.c 1 Feb 2006 05:43:48 -0000 1.29 @@ -1092,12 +1092,14 @@ */ x = ewl_object_current_x_get(EWL_OBJECT(child)); y = ewl_object_current_y_get(EWL_OBJECT(child)); + if (x < CURRENT_X(w)) x = CURRENT_X(w); if (y < CURRENT_Y(w)) y = CURRENT_Y(w); - ewl_object_place(child, x, y, CURRENT_W(w) - x, - CURRENT_H(w) - y); + + ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)), + CURRENT_H(w) - (y - CURRENT_Y(w))); } DLEAVE_FUNCTION(DLEVEL_STABLE); |
From: <enl...@li...> - 2006-02-01 07:14:18
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_events.c ewl_window.c Log Message: finally tracked down the sizing bug that caused windows to cut off their children. something similar may need to be done to ewl_embed. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_events.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ewl_events.c 9 Jan 2006 00:04:26 -0000 1.18 +++ ewl_events.c 1 Feb 2006 07:14:12 -0000 1.19 @@ -236,8 +236,15 @@ /* * Configure events really only need to occur on resize. */ - if ((CURRENT_W(window) != ev->w) || (CURRENT_H(window) != ev->h)) { - window->flags |= EWL_WINDOW_USER_CONFIGURE; + if ((ewl_object_current_w_get(EWL_OBJECT(window)) != ev->w) || (ewl_object_current_h_get(EWL_OBJECT(window)) != ev->h)) { + + /* + * Right now this is commented out, as it was preventing windows from resizing + * when WE were the ones setting the size (mainly on initial show of the + * window). It would be nice to add this back in to limit the # of window + * resizes occuring. (As long as it doesn't break initial size.) + */ + /* if (ev->from_wm) window->flags |= EWL_WINDOW_USER_CONFIGURE; */ ewl_object_geometry_request(EWL_OBJECT(window), 0, 0, ev->w, ev->h); } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ewl_window.c 1 Feb 2006 05:43:48 -0000 1.29 +++ ewl_window.c 1 Feb 2006 07:14:12 -0000 1.30 @@ -1033,7 +1033,7 @@ * Now give the windows the appropriate size and adjust the evas as * well. */ - if (win->flags & EWL_WINDOW_USER_CONFIGURE) + if (win->flags & EWL_WINDOW_USER_CONFIGURE) win->flags &= ~EWL_WINDOW_USER_CONFIGURE; else { #ifdef ENABLE_EWL_SOFTWARE_X11 @@ -1083,6 +1083,7 @@ ecore_list_goto_first(EWL_CONTAINER(w)->children); while ((child = ecore_list_next(EWL_CONTAINER(w)->children))) { int x, y; + int size; /* * Try to give the child the full size of the window from it's @@ -1092,12 +1093,22 @@ */ x = ewl_object_current_x_get(EWL_OBJECT(child)); y = ewl_object_current_y_get(EWL_OBJECT(child)); - + if (x < CURRENT_X(w)) + { x = CURRENT_X(w); + size = ewl_object_preferred_w_get(EWL_OBJECT(child)); + if (size > PREFERRED_W(w)) + ewl_object_preferred_inner_w_set(EWL_OBJECT(w), size); + } if (y < CURRENT_Y(w)) + { y = CURRENT_Y(w); - + size = ewl_object_preferred_h_get(EWL_OBJECT(child)); + if (size > PREFERRED_H(w)) + ewl_object_preferred_inner_h_set(EWL_OBJECT(w), size); + } + ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)), CURRENT_H(w) - (y - CURRENT_Y(w))); } |
From: Enlightenment C. <no...@cv...> - 2006-04-30 04:52:34
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_icon.c Log Message: center align icon label =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ewl_icon.c 13 Apr 2006 20:37:22 -0000 1.9 +++ ewl_icon.c 30 Apr 2006 04:51:39 -0000 1.10 @@ -220,6 +220,7 @@ if (!icon->label) { icon->label = ewl_text_new(); + ewl_object_alignment_set(EWL_OBJECT(icon->label), EWL_FLAG_ALIGN_CENTER); if (icon->editable) ewl_callback_append(icon->label, |
From: Enlightenment C. <no...@cv...> - 2006-04-30 05:21:08
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_icon.c Log Message: set icon to FILL_NONE center preview also =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ewl_icon.c 30 Apr 2006 04:51:39 -0000 1.10 +++ ewl_icon.c 30 Apr 2006 05:20:10 -0000 1.11 @@ -48,6 +48,7 @@ if (!ewl_box_init(EWL_BOX(icon))) DRETURN_INT(FALSE, DLEVEL_STABLE); + ewl_object_fill_policy_set(EWL_OBJECT(icon), EWL_FLAG_FILL_NONE); ewl_box_orientation_set(EWL_BOX(icon), EWL_ORIENTATION_VERTICAL); ewl_box_spacing_set(EWL_BOX(icon), 4); @@ -122,6 +123,7 @@ { icon->preview = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(icon->preview), TRUE); + ewl_object_alignment_set(EWL_OBJECT(icon->preview), EWL_FLAG_ALIGN_CENTER); ewl_widget_internal_set(icon->preview, TRUE); ewl_container_child_prepend(EWL_CONTAINER(icon), icon->preview); |
From: Enlightenment C. <no...@cv...> - 2006-12-13 19:48:00
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/x11 Modified Files: ewl_engine_x11.c Log Message: update to match ecore_x api change =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/x11/ewl_engine_x11.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- ewl_engine_x11.c 11 Dec 2006 23:16:50 -0000 1.31 +++ ewl_engine_x11.c 13 Dec 2006 19:47:55 -0000 1.32 @@ -797,7 +797,7 @@ DRETURN_INT(ecore_x_selection_notify_send(request->requestor, request->selection, request->target, - request->property), DLEVEL_STABLE); + request->property, request->time), DLEVEL_STABLE); } static int |
From: Enlightenment C. <no...@cv...> - 2007-02-14 04:40:53
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17/groups Modified Files: tree.edc Log Message: add Expansion widget use this in tree2 so children get correctly inset from parents ** themes need to be updated to use theme key /expansion/group instead of /node/check/group, and support the signals 'expandable' and 'nonexpandable' ** =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/tree.edc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- tree.edc 12 Jan 2007 10:19:29 -0000 1.7 +++ tree.edc 14 Feb 2007 10:40:52 -0000 1.8 @@ -86,54 +86,36 @@ group { name: "ewl/tree/expansion"; + min: 12 12; parts { part { - name: "base"; + name: "clip"; type: RECT; mouse_events: 1; description { state: "default" 0.0; - min: 12 12; - - rel1 - { - relative: 0.0 0.0; - offset: 0 0; - } - rel2 - { - relative: 1.0 1.0; - offset: -1 -1; - } - color: 255 255 255 255; + visible: 1; + } + description + { + state: "hidden" 0.0; + visible: 0; } } part { name: "expansion"; mouse_events: 1; + clip_to: "clip"; description { state: "default" 0.0; - min: 5 5; - - rel1 - { - to: "base"; - relative: 0.5 0.5; - offset: 0 0; - } - rel2 - { - to: "base"; - relative: 0.5 0.5; - offset: -1 -1; - } + max: 5 5; image { normal: "e17_icon_right_arrow.png"; @@ -149,58 +131,25 @@ } } } - part - { - name: "hide"; - type: RECT; - mouse_events: 0; - - description - { - state: "default" 0.0; - visible: 0; - rel1 - { - relative: 0.0 0.0; - offset: 0 0; - to: "expansion"; - } - rel2 - { - relative: 1.0 1.0; - offset: -1 -1; - to: "expansion"; - } - color: 255 255 255 0; - } - description - { - state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } } programs { program { - name: "visible"; - signal: "default"; + name: "expandable"; + signal: "expandable"; source: "*"; - action: STATE_SET "show" 0.0; - transition: LINEAR 0.0; - target: "hide"; + action: STATE_SET "default" 0.0; + target: "clip"; } program { - name: "hidden"; - signal: "node,default"; + name: "nonexpandable"; + signal: "nonexpandable"; source: "*"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.0; - target: "hide"; + action: STATE_SET "hidden" 0.0; + target: "clip"; } program { |
From: Enlightenment C. <no...@cv...> - 2007-02-14 04:41:22
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: add Expansion widget use this in tree2 so children get correctly inset from parents ** themes need to be updated to use theme key /expansion/group instead of /node/check/group, and support the signals 'expandable' and 'nonexpandable' ** =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e17.edc 13 Feb 2007 05:27:52 -0000 1.19 +++ e17.edc 14 Feb 2007 10:40:51 -0000 1.20 @@ -146,7 +146,8 @@ item: "/tree_header/header/button/group" "ewl/tree/header/button"; item: "/row/group" "ewl/row"; - item: "/node/check/group" "ewl/tree/expansion"; +// item: "/node/check/group" "ewl/tree/expansion"; + item: "/expansion/group" "ewl/tree/expansion"; /* window related groups */ item: "/tooltip/group" "ewl/window"; |
From: Enlightenment C. <no...@cv...> - 2007-02-14 04:41:23
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_tree2.c Makefile.am Added Files: ewl_expansion.c ewl_expansion.h Log Message: add Expansion widget use this in tree2 so children get correctly inset from parents ** themes need to be updated to use theme key /expansion/group instead of /node/check/group, and support the signals 'expandable' and 'nonexpandable' ** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- ewl_tree2.c 7 Feb 2007 07:45:32 -0000 1.56 +++ ewl_tree2.c 14 Feb 2007 10:40:51 -0000 1.57 @@ -4,6 +4,7 @@ #include "ewl_button.h" #include "ewl_cell.h" #include "ewl_check.h" +#include "ewl_expansion.h" #include "ewl_label.h" #include "ewl_paned.h" #include "ewl_row.h" @@ -879,6 +880,11 @@ ewl_tree2_build_tree_rows(tree, tmp, colour, node, hidden); FREE(tmp); } + else + { + ewl_tree2_node_expandable_set(EWL_TREE2_NODE(node), + NULL); + } i++; /* @@ -1247,22 +1253,29 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("node", node); - if (data && !node->handle) + if (!node->handle) { - node->handle = ewl_check_new(); + node->handle = ewl_expansion_new(); ewl_object_fill_policy_set(EWL_OBJECT(node->handle), EWL_FLAG_FILL_NONE); ewl_object_alignment_set(EWL_OBJECT(node->handle), EWL_FLAG_ALIGN_TOP); ewl_container_child_prepend(EWL_CONTAINER(node), node->handle); + ewl_widget_show(node->handle); + } + if (data) + { ewl_callback_append(node->handle, EWL_CALLBACK_VALUE_CHANGED, ewl_tree2_cb_node_toggle, node); - ewl_widget_show(node->handle); + ewl_widget_enable(node->handle); + ewl_expansion_expandable_set(EWL_EXPANSION(node->handle), TRUE); } else if (node->handle && !data) { - ewl_widget_destroy(node->handle); - node->handle = NULL; + ewl_callback_del(node->handle, EWL_CALLBACK_VALUE_CHANGED, + ewl_tree2_cb_node_toggle); + ewl_widget_disable(node->handle); + ewl_expansion_expandable_set(EWL_EXPANSION(node->handle), FALSE); } DLEAVE_FUNCTION(DLEVEL_STABLE); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- Makefile.am 6 Feb 2007 13:42:16 -0000 1.48 +++ Makefile.am 14 Feb 2007 10:40:51 -0000 1.49 @@ -37,6 +37,7 @@ ewl_entry.h \ ewl_enums.h \ ewl_events.h \ + ewl_expansion.h \ ewl_floater.h \ ewl_filelist.h \ ewl_filelist_tree.h\ @@ -120,6 +121,7 @@ ewl_engines.c \ ewl_entry.c \ ewl_events.c \ + ewl_expansion.c \ ewl_floater.c \ ewl_filelist.c \ ewl_filelist_tree.c \ |