From: <enl...@li...> - 2004-06-08 18:26:07
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler Log Message: Directory /cvsroot/enlightenment/misc/ewler added to the repository |
From: <enl...@li...> - 2004-06-08 18:28:02
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Log Message: Directory /cvsroot/enlightenment/misc/ewler/src added to the repository |
From: <enl...@li...> - 2004-06-08 18:28:02
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data Log Message: Directory /cvsroot/enlightenment/misc/ewler/data added to the repository |
From: <enl...@li...> - 2004-06-08 18:28:02
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/images Log Message: Directory /cvsroot/enlightenment/misc/ewler/data/images added to the repository |
From: <enl...@li...> - 2004-06-08 18:28:03
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/schemas Log Message: Directory /cvsroot/enlightenment/misc/ewler/data/schemas added to the repository |
From: <enl...@li...> - 2004-06-08 18:30:11
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/images Added Files: Makefile.am stock_apply.png stock_cancel.png stock_ok.png stock_open.png stock_save.png Log Message: Initial Commit |
From: <enl...@li...> - 2004-06-08 18:30:12
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README TODO acinclude.m4 autogen.sh configure.in Log Message: Initial Commit |
From: <enl...@li...> - 2004-06-08 18:30:12
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Added Files: Makefile.am ewl_button_stock.c ewl_button_stock.h ewl_dialog.c ewl_dialog.h ewl_filedialog_stock.c ewl_filedialog_stock.h ewl_stock.c ewl_stock.h ewler.c ewler.h form.c form.h form_file.c form_file.h inspector.c inspector.h main.c project.c project.h widgets.c widgets.h Log Message: Initial Commit |
From: <enl...@li...> - 2004-06-08 18:30:12
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data Added Files: Makefile.am Log Message: Initial Commit |
From: <enl...@li...> - 2004-06-08 18:30:58
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/schemas Added Files: Makefile.am widgets.xml Log Message: Initial Commit |
From: <enl...@li...> - 2004-06-09 07:38:12
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Added Files: selected.c selected.h Log Message: Initial Commit. |
From: <enl...@li...> - 2004-06-09 18:45:20
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Modified Files: Makefile.am form.c inspector.c selected.c selected.h Log Message: Selection now highlights selected widgets. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 8 Jun 2004 18:30:05 -0000 1.1 +++ Makefile.am 9 Jun 2004 18:45:12 -0000 1.2 @@ -15,6 +15,7 @@ inspector.c inspector.h \ main.c \ project.c project.h \ + selected.c selected.h \ widgets.c widgets.h ewler_LDADD = @ewl_libs@ @xml2_libs@ =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- form.c 8 Jun 2004 18:30:05 -0000 1.1 +++ form.c 9 Jun 2004 18:45:12 -0000 1.2 @@ -15,6 +15,7 @@ #include "form_file.h" #include "project.h" #include "inspector.h" +#include "selected.h" Ecore_List *forms; static int widget_selected = 0; @@ -85,8 +86,8 @@ form_selected_append( form, w ); - dragging.x = ev->x; - dragging.y = ev->y; + dragging.x = ev->x - CURRENT_X(w); + dragging.y = ev->y - CURRENT_Y(w); dragging.active = 1; widget_selected = 1; @@ -98,25 +99,15 @@ { Ewler_Form *form = EWLER_FORM(user_data); Ewl_Event_Mouse_Move *ev = ev_data; - Ewl_Widget *c_w; - int dx, dy; + Ewl_Widget *c_s; if( dragging.active ) { - dx = ev->x - dragging.x; - dy = ev->y - dragging.y; - ecore_list_goto_first( form->selected ); - while( (c_w = ecore_list_next( form->selected )) ) { - int x, y; - - x = CURRENT_X(c_w) + dx; - y = CURRENT_Y(c_w) + dy; - ewl_object_request_position( EWL_OBJECT(c_w), x, y ); - /* update the individual width entries */ + while( (c_s = ecore_list_next(form->selected)) ) { + ewl_object_request_position(EWL_OBJECT(c_s), + ev->x - dragging.x, ev->y - dragging.y); } - dragging.x = ev->x; - dragging.y = ev->y; } } @@ -125,28 +116,21 @@ { Ewler_Form *form = EWLER_FORM(user_data); Ewl_Event_Mouse_Up *ev = ev_data; - Ewl_Widget *c_w; - int dx, dy; + Ewl_Widget *c_s, *c_w; if( dragging.active ) { - dx = ev->x - dragging.x; - dy = ev->y - dragging.y; - ecore_list_goto_first( form->selected ); - while( (c_w = ecore_list_current( form->selected )) ) { - int x, y; - - x = CURRENT_X(c_w) + dx; - y = CURRENT_Y(c_w) + dy; - ewl_object_request_position( EWL_OBJECT(c_w), x, y ); - /* update the individual width entries */ - ecore_list_next( form->selected ); + while( (c_s = ecore_list_next( form->selected )) ) { + ewl_object_request_position(EWL_OBJECT(c_s), + ev->x - dragging.x, ev->y - dragging.y); + widget_changed(ewler_selected_get(EWLER_SELECTED(c_s))); } dragging.x = dragging.y = 0; dragging.active = 0; - widget_changed( w ); + c_w = ewler_selected_get(EWLER_SELECTED(c_s)); + } } @@ -171,7 +155,6 @@ switch( ev->button ) { case 1: if( !widget_selected ) { - tool_ctor = widget_get_ctor( tool_get_name() ); if( tool_ctor ) { char *widget_name; @@ -196,10 +179,6 @@ ewl_callback_append( nw, EWL_CALLBACK_MOUSE_DOWN, __mouse_down_widget, form ); - ewl_callback_append( nw, EWL_CALLBACK_MOUSE_UP, - __mouse_up_widget, form ); - ewl_callback_append( nw, EWL_CALLBACK_MOUSE_MOVE, - __mouse_move_widget, form ); ewl_callback_append( nw, EWL_CALLBACK_FOCUS_IN, __mouse_in_form, form ); ewl_object_request_position( EWL_OBJECT(nw), ev->x, ev->y ); @@ -238,10 +217,6 @@ ewl_callback_append( w, EWL_CALLBACK_MOUSE_DOWN, __mouse_down_widget, form ); - ewl_callback_append( w, EWL_CALLBACK_MOUSE_UP, - __mouse_up_widget, form ); - ewl_callback_append( w, EWL_CALLBACK_MOUSE_MOVE, - __mouse_move_widget, form ); ewl_callback_append( w, EWL_CALLBACK_FOCUS_IN, __mouse_in_form, form ); @@ -280,6 +255,8 @@ __mouse_down_form, form ); ewl_callback_append( form->overlay, EWL_CALLBACK_FOCUS_IN, __mouse_in_form, form ); + ewl_callback_append( form->overlay, EWL_CALLBACK_MOUSE_MOVE, + __mouse_move_widget, form ); ewl_container_append_child( EWL_CONTAINER(form->window), form->overlay ); ewl_widget_show( form->overlay ); @@ -381,7 +358,6 @@ ewl_widget_set_appearance( form->overlay, "entry" ); ewl_callback_del_type( form->overlay, EWL_CALLBACK_MOUSE_DOWN ); - ewl_callback_del_type( form->overlay, EWL_CALLBACK_MOUSE_MOVE ); ewl_callback_del_type( form->overlay, EWL_CALLBACK_MOUSE_UP ); ewl_callback_del_type( form->overlay, EWL_CALLBACK_FOCUS_IN ); @@ -401,13 +377,28 @@ void form_selected_clear( Ewler_Form *form ) { - ecore_list_clear( form->selected ); + Ewl_Widget *s; + ecore_list_goto_first( form->selected ); + + while( (s = ecore_list_remove(form->selected)) ) { + ewl_callback_call(s, EWL_CALLBACK_DESELECT); + ewl_widget_destroy( s ); + } } void form_selected_append( Ewler_Form *form, Ewl_Widget *w ) { - ecore_list_append( form->selected, w ); + Ewl_Widget *s; + + s = ewler_selected_new( w ); + ewl_widget_show(s); + ewl_callback_append(s, EWL_CALLBACK_MOUSE_MOVE, + __mouse_move_widget, form); + ewl_callback_append(s, EWL_CALLBACK_MOUSE_UP, + __mouse_up_widget, form); + + ecore_list_append( form->selected, s ); inspector_reset(); } @@ -431,7 +422,7 @@ if( forms ) { ecore_list_goto_first( forms ); - while( form = EWLER_FORM(ecore_list_remove( forms )) ) { + while( (form = EWLER_FORM(ecore_list_remove( forms ))) ) { if( form->dirty ) fprintf( stderr, "closing a dirty form\n" ); =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/inspector.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- inspector.c 8 Jun 2004 18:30:05 -0000 1.1 +++ inspector.c 9 Jun 2004 18:45:12 -0000 1.2 @@ -6,6 +6,7 @@ #include "form.h" #include "inspector.h" #include "widgets.h" +#include "selected.h" static Ewl_Widget *inspector_win; static Ewler_Form *active_form = NULL; @@ -180,7 +181,10 @@ switch( data->type->w.w_type ) { case WIDGET_STRING_TYPE: - ewl_entry_set_text( EWL_ENTRY(row_elems[1]), data->w_str.value ); + if( data->w_str.value ) + ewl_entry_set_text( EWL_ENTRY(row_elems[1]), data->w_str.value ); + else + ewl_entry_set_text( EWL_ENTRY(row_elems[1]), "" ); break; case WIDGET_INTEGER_TYPE: sprintf( buf, "%ld", data->w_int.value ); @@ -213,7 +217,10 @@ ewl_container_child_iterate_begin( c ); - row = ewl_container_next_child( c ); + while( (row = ewl_container_next_child(c)) != EWL_TREE_NODE(c)->row ) + ; + + row = EWL_TREE_NODE(c)->row; cell = ewl_row_get_column( EWL_ROW(row), 1 ); @@ -230,7 +237,10 @@ switch( data->type->w.w_type ) { case WIDGET_STRING_TYPE: - ewl_entry_set_text( EWL_ENTRY(entry), data->w_str.value ); + if( data->w_str.value ) + ewl_entry_set_text( EWL_ENTRY(entry), data->w_str.value ); + else + ewl_entry_set_text( EWL_ENTRY(entry), "" ); break; case WIDGET_INTEGER_TYPE: sprintf( buf, "%ld", data->w_int.value ); @@ -240,7 +250,7 @@ } } - while( (node = ewl_container_next_child( EWL_CONTAINER(c)) ) ) + while( (node = ewl_container_next_child(c)) ) inspector_subupdate( EWL_CONTAINER(node) ); } @@ -258,7 +268,7 @@ void inspector_reset( void ) { - Ewl_Widget *s; + Ewl_Widget *s, *w; Ecore_List *info; if( !active_form ) { @@ -268,16 +278,16 @@ s = ecore_list_goto_first( active_form->selected ); - if( s == active_widget ) { + if( s && ewler_selected_get(EWLER_SELECTED(s)) == active_widget ) { inspector_update(); return; } ewl_container_reset( EWL_CONTAINER(inspector_tree) ); - if( s ) { - info = widget_get_info( s ); - active_widget = s; + if( (w = ewler_selected_get(EWLER_SELECTED(s))) ) { + info = widget_get_info(w); + active_widget = w; prow = NULL; ecore_list_for_each( info, __populate_tree ); =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- selected.c 9 Jun 2004 07:38:05 -0000 1.1 +++ selected.c 9 Jun 2004 18:45:12 -0000 1.2 @@ -53,8 +53,9 @@ ecore_list_goto(parent->children, w); index = ecore_list_index(parent->children); - if (!ewl_container_init(EWL_CONTAINER(s), "entry")) + if (!ewl_box_init(EWL_BOX(s), EWL_ORIENTATION_VERTICAL)) DRETURN_INT(FALSE, DLEVEL_STABLE); + ewl_widget_set_appearance(sw, "entry"); ewl_container_insert_child(parent, sw, index); ewl_container_append_child(EWL_CONTAINER(s), w); @@ -66,8 +67,8 @@ ewler_selected_configure_cb, NULL); ewl_callback_append(w, EWL_CALLBACK_REALIZE, ewler_selected_realize_cb, NULL); - ewl_callback_prepend(sw, EWL_CALLBACK_DESTROY, - ewler_selected_destroy_cb, NULL); + ewl_callback_append(sw, EWL_CALLBACK_DESELECT, + ewler_selected_deselect_cb, NULL); s->index = index; s->selected = w; @@ -104,10 +105,8 @@ x = CURRENT_X(s); y = CURRENT_Y(s); - if( x != CURRENT_X(s->selected) || y != CURRENT_Y(s->selected) ) { - printf( "setting position : (\n" ); + if( x != CURRENT_X(s->selected) || y != CURRENT_Y(s->selected) ) ewl_object_request_position(EWL_OBJECT(s->selected), x, y); - } if( width != CURRENT_W(s) || height != CURRENT_H(s) ) ewl_object_set_preferred_size(EWL_OBJECT(s), width, height); @@ -133,16 +132,23 @@ } void -ewler_selected_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data) +ewler_selected_deselect_cb(Ewl_Widget *w, void *ev_data, void *user_data) { Ewler_Selected *s; + int x, y, width, height; DENTER_FUNCTION(DLEVEL_STABLE); s = EWLER_SELECTED(w); + ewl_object_get_current_geometry(EWL_OBJECT(s), &x, &y, &width, &height); ewl_container_insert_child(EWL_CONTAINER(w->parent), s->selected, s->index); - + ewl_object_request_geometry(EWL_OBJECT(s->selected), x, y, width, height); +#if 0 + ewl_object_set_preferred_size(EWL_OBJECT(s->selected), width, height); +#endif + + s->selected = NULL; s->index = -1; =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- selected.h 9 Jun 2004 07:38:05 -0000 1.1 +++ selected.h 9 Jun 2004 18:45:12 -0000 1.2 @@ -6,7 +6,7 @@ #define EWLER_SELECTED(s) ((Ewler_Selected *) s) struct Ewler_Selected { - Ewl_Container container; + Ewl_Box box; Ewl_Widget *selected; int index; }; @@ -17,6 +17,6 @@ Ewl_Widget *ewler_selected_get(Ewler_Selected *s); void ewler_selected_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewler_selected_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewler_selected_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewler_selected_deselect_cb(Ewl_Widget *w, void *ev_data, void *user_data); #endif |
From: <enl...@li...> - 2004-06-09 20:08:21
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes Log Message: Directory /cvsroot/enlightenment/misc/ewler/data/themes added to the repository |
From: <enl...@li...> - 2004-06-09 20:14:29
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler/bits Added Files: Makefile.am selected-groups.edc selected-programs.edc Log Message: Added selection theme. |
From: <enl...@li...> - 2004-06-09 20:17:09
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler Added Files: Makefile.am Log Message: Added selected theme. |
From: <enl...@li...> - 2004-06-09 20:53:27
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Modified Files: form.c selected.c Log Message: Fixed up selected theme. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- form.c 9 Jun 2004 18:45:12 -0000 1.2 +++ form.c 9 Jun 2004 20:53:20 -0000 1.3 @@ -106,7 +106,8 @@ while( (c_s = ecore_list_next(form->selected)) ) { ewl_object_request_position(EWL_OBJECT(c_s), - ev->x - dragging.x, ev->y - dragging.y); + ev->x - dragging.x - 8, + ev->y - dragging.y - 8); } } } @@ -123,7 +124,8 @@ while( (c_s = ecore_list_next( form->selected )) ) { ewl_object_request_position(EWL_OBJECT(c_s), - ev->x - dragging.x, ev->y - dragging.y); + ev->x - dragging.x - 8, + ev->y - dragging.y - 8); widget_changed(ewler_selected_get(EWLER_SELECTED(c_s))); } dragging.x = dragging.y = 0; =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- selected.c 9 Jun 2004 20:19:11 -0000 1.3 +++ selected.c 9 Jun 2004 20:53:20 -0000 1.4 @@ -60,11 +60,12 @@ ewl_theme_data_set_str(sw, "/selected/file", PACKAGE_DATA_DIR"/themes/ewler.eet"); ewl_theme_data_set_str(sw, "/selected/group", "selected"); + ewl_object_set_insets(EWL_OBJECT(s), 4, 4, 4, 4); ewl_container_insert_child(parent, sw, index); ewl_container_append_child(EWL_CONTAINER(s), w); ewl_object_request_geometry(EWL_OBJECT(s), - CURRENT_X(w) - 4, CURRENT_Y(w) - 4, + CURRENT_X(w) - 8, CURRENT_Y(w) - 8, CURRENT_W(w) + 8, CURRENT_H(w) + 8); ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_NONE); ewl_widget_set_layer(sw, ewl_widget_get_layer(s->selected) + 1); @@ -150,7 +151,7 @@ ewl_object_get_current_geometry(EWL_OBJECT(s), &x, &y, &width, &height); ewl_container_insert_child(EWL_CONTAINER(w->parent), s->selected, s->index); ewl_object_request_geometry(EWL_OBJECT(s->selected), - x + 4, y + 4, width - 8, height - 8); + x + 8, y + 8, width - 8, height - 8); s->selected = NULL; s->index = -1; |
From: <enl...@li...> - 2004-06-09 20:53:27
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler/bits Modified Files: Makefile.am Log Message: Fixed up selected theme. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/data/themes/ewler/bits/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 9 Jun 2004 20:14:23 -0000 1.1 +++ Makefile.am 9 Jun 2004 20:53:19 -0000 1.2 @@ -1,6 +1,6 @@ -SUBDIRS = images +SUBDIRS = -EDCS = selected-groups.edc selected-programs.edc \ +EDCS = selected-groups.edc selected-programs.edc EETS = $(EDCS:%.edc=%.eet) |
From: <enl...@li...> - 2004-06-10 23:36:07
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/schemas Modified Files: widgets.xml Log Message: Lots of things to try and help selected. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/data/schemas/widgets.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- widgets.xml 8 Jun 2004 18:30:51 -0000 1.1 +++ widgets.xml 10 Jun 2004 23:32:24 -0000 1.2 @@ -97,7 +97,7 @@ <elem type="string" set="ewl_window_set_class" get="ewl_window_get_class">classname</elem> <elem type="string">render</elem> </class> - <class name="Ewl_Entry" super="Ewl_Container"> - <elem type="string" set="ewl_entry_set_text" get="ewl_entry_get_text">text</elem> + <class name="Ewl_Combo" super="Ewl_Box" ctor="ewl_combo_new"> + <elem type="string" set="ewl_combo_set_selected" get="ewl_combo_get_selected">selected</elem> </class> </classes> |
From: <enl...@li...> - 2004-06-10 23:36:08
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler/bits Modified Files: selected-groups.edc selected-programs.edc Log Message: Lots of things to try and help selected. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/data/themes/ewler/bits/selected-groups.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- selected-groups.edc 9 Jun 2004 20:14:23 -0000 1.1 +++ selected-groups.edc 10 Jun 2004 23:32:24 -0000 1.2 @@ -10,7 +10,7 @@ part { name, "top_left"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; @@ -27,7 +27,7 @@ part { name, "top_middle"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; @@ -44,13 +44,13 @@ part { name, "top_right"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; rel1 { relative, 1.0 0.0; - offset, -4 0; + offset, -5 0; } rel2 { relative, 1.0 0.0; @@ -61,13 +61,13 @@ part { name, "middle_right"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; rel1 { relative, 1.0 0.5; - offset, -4 -2; + offset, -5 -2; } rel2 { relative, 1.0 0.5; @@ -78,13 +78,13 @@ part { name, "bottom_right"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; rel1 { relative, 1.0 1.0; - offset, -4 -4; + offset, -5 -5; } rel2 { relative, 1.0 1.0; @@ -95,13 +95,13 @@ part { name, "bottom_middle"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; rel1 { relative, 0.5 1.0; - offset, -2 -4; + offset, -2 -5; } rel2 { relative, 0.5 1.0; @@ -112,13 +112,13 @@ part { name, "bottom_left"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; rel1 { relative, 0.0 1.0; - offset, 0 -4; + offset, 0 -5; } rel2 { relative, 0.0 1.0; @@ -129,7 +129,7 @@ part { name, "middle_left"; type, RECT; - mouse_events, 0; + mouse_events, 1; description { state, "default" 0.0; color, 0 0 255 255; |
From: <enl...@li...> - 2004-07-01 18:31:29
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Modified Files: form.c selected.c selected.h Log Message: Widget resizing by clicking on the portions of the selected widget works. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- form.c 10 Jun 2004 23:32:24 -0000 1.4 +++ form.c 1 Jul 2004 18:31:22 -0000 1.5 @@ -408,11 +408,11 @@ Ewl_Widget *s; s = ewler_selected_new( w ); - ewl_widget_show(s); ewl_callback_append(s, EWL_CALLBACK_MOUSE_MOVE, __mouse_move_widget, form); - ewl_callback_append(s, EWL_CALLBACK_MOUSE_UP, + ewl_callback_append(w, EWL_CALLBACK_MOUSE_UP, __mouse_up_widget, form); + ewl_widget_show(s); ecore_list_append( form->selected, s ); inspector_reset(); =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- selected.c 10 Jun 2004 23:32:39 -0000 1.5 +++ selected.c 1 Jul 2004 18:31:22 -0000 1.6 @@ -63,8 +63,11 @@ ewl_theme_data_set_str(sw, "/selected/group", "selected"); ewl_object_set_insets(EWL_OBJECT(s), 4, 4, 4, 4); +#if 0 ewl_container_insert_child(parent, sw, index); ewl_container_append_child(EWL_CONTAINER(s), w); +#endif + ewl_container_append_child(parent, sw); ewl_object_request_geometry(EWL_OBJECT(s), CURRENT_X(w) - 8, CURRENT_Y(w) - 8, CURRENT_W(w) + 8, CURRENT_H(w) + 8); @@ -74,23 +77,21 @@ ewl_callback_append(sw, EWL_CALLBACK_CONFIGURE, ewler_selected_configure_cb, NULL); ewl_callback_append(w, EWL_CALLBACK_REALIZE, - ewler_selected_realize_cb, NULL); + ewler_selected_realize_cb, s); + ewl_callback_append(sw, EWL_CALLBACK_REALIZE, + ewler_selected_selector_realize_cb, NULL); ewl_callback_append(sw, EWL_CALLBACK_DESELECT, ewler_selected_deselect_cb, NULL); ewl_callback_append(sw, EWL_CALLBACK_MOUSE_MOVE, ewler_selected_mouse_move_cb, NULL); ewl_callback_append(sw, EWL_CALLBACK_MOUSE_DOWN, ewler_selected_mouse_down_cb, NULL); - - edje_object_signal_callback_add(sw->theme_object, - "top_left", "down", - ewler_selected_part_down, s); - edje_object_signal_callback_add(sw->theme_object, - "top_left", "up", - ewler_selected_part_up, s); + ewl_callback_append(sw, EWL_CALLBACK_MOUSE_UP, + ewler_selected_mouse_up_cb, NULL); s->index = index; s->selected = w; + s->dragging = NULL; DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -133,6 +134,64 @@ } void +ewler_selected_selector_realize_cb(Ewl_Widget *w, void *ev_data, + void *user_data) +{ + DENTER_FUNCTION(DLEVEL_STABLE); + + edje_object_signal_callback_add(w->theme_object, + "down", "top_left", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "top_left", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "top_middle", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "top_middle", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "top_right", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "top_right", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "middle_right", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "middle_right", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "bottom_right", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "bottom_right", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "bottom_middle", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "bottom_middle", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "bottom_left", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "bottom_left", + ewler_selected_part_up, w); + edje_object_signal_callback_add(w->theme_object, + "down", "middle_left", + ewler_selected_part_down, w); + edje_object_signal_callback_add(w->theme_object, + "up", "middle_left", + ewler_selected_part_up, w); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +void ewler_selected_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data) { Ewler_Selected *s; @@ -140,7 +199,10 @@ DENTER_FUNCTION(DLEVEL_STABLE); +#if 0 s = EWLER_SELECTED(w->parent); +#endif + s = EWLER_SELECTED(user_data); ewl_object_get_preferred_size(EWL_OBJECT(s->selected), &width, &height); @@ -161,7 +223,9 @@ s = EWLER_SELECTED(w); ewl_object_get_current_geometry(EWL_OBJECT(s), &x, &y, &width, &height); +#if 0 ewl_container_insert_child(EWL_CONTAINER(w->parent), s->selected, s->index); +#endif ewl_object_request_geometry(EWL_OBJECT(s->selected), x + 8, y + 8, width - 8, height - 8); @@ -175,14 +239,29 @@ ewler_selected_part_down(void *data, Evas_Object *o, const char *emission, const char *source) { - printf( "in part_down with emission %s, source %s\n", emission, source ); + Ewler_Selected *s = data; + Ewl_Widget *sw = data; + + if( s->dragging ) + FREE(s->dragging); + + s->dragging = strdup( source ); + s->corners.x = CURRENT_X(sw); + s->corners.y = CURRENT_Y(sw); + s->corners.u = CURRENT_X(sw) + CURRENT_W(sw); + s->corners.v = CURRENT_Y(sw) + CURRENT_H(sw); } void ewler_selected_part_up(void *data, Evas_Object *o, const char *emission, const char *source) { - printf( "in part_up with emission %s, source %s\n", emission, source ); + Ewler_Selected *s = data; + + if( s->dragging ) + FREE(s->dragging); + + s->dragging = NULL; } void @@ -190,10 +269,36 @@ { Ewl_Embed *embed; Ewl_Event_Mouse_Move *ev = ev_data; + Ewler_Selected *s = EWLER_SELECTED(w); embed = ewl_embed_find_by_widget(w); evas_event_feed_mouse_move(embed->evas, ev->x, ev->y); + + if( s->dragging ) { + if( strstr( s->dragging, "left" ) ) + s->corners.x = ev->x; + if( strstr( s->dragging, "right" ) ) + s->corners.u = ev->x; + if( strstr( s->dragging, "top" ) ) + s->corners.y = ev->y; + if( strstr( s->dragging, "bottom" ) ) + s->corners.v = ev->y; + + if( s->corners.u - s->corners.x < 0 ) + s->corners.u = s->corners.x; + if( s->corners.v - s->corners.y < 0 ) + s->corners.v = s->corners.y; + + ewl_object_request_position(EWL_OBJECT(s), s->corners.x, s->corners.y); + ewl_object_set_preferred_size(EWL_OBJECT(s), + s->corners.u - s->corners.x, + s->corners.v - s->corners.y); + ewl_object_set_preferred_size(EWL_OBJECT(s->selected), + s->corners.u - s->corners.x - 8, + s->corners.v - s->corners.y - 8); + + } } void =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- selected.h 10 Jun 2004 23:32:39 -0000 1.3 +++ selected.h 1 Jul 2004 18:31:22 -0000 1.4 @@ -8,6 +8,11 @@ struct Ewler_Selected { Ewl_Box box; Ewl_Widget *selected; + char *dragging; + struct { + int x, y; /* top left */ + int u, v; /* lower right */ + } corners; int index; }; @@ -17,6 +22,8 @@ Ewl_Widget *ewler_selected_get(Ewler_Selected *s); void ewler_selected_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewler_selected_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewler_selected_selector_realize_cb(Ewl_Widget *w, void *ev_data, + void *user_data); void ewler_selected_deselect_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewler_selected_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); |
From: <enl...@li...> - 2004-07-05 02:38:38
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler/bits/images Log Message: Directory /cvsroot/enlightenment/misc/ewler/data/themes/ewler/bits/images added to the repository |
From: <enl...@li...> - 2004-07-05 02:43:20
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler Modified Files: Makefile.am Log Message: Added background to forms and extracted some better behavior from selected items. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/data/themes/ewler/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 9 Jun 2004 20:17:01 -0000 1.3 +++ Makefile.am 5 Jul 2004 02:40:45 -0000 1.4 @@ -1,6 +1,7 @@ SUBDIRS = -EDCS = selected-groups.edc selected-programs.edc +EDCS = selected-groups.edc selected-programs.edc \ + background-groups.edc background-images.edc EETS = $(EDCS:%.edc=%.eet) |
From: <enl...@li...> - 2004-07-05 02:43:28
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/src Modified Files: form.c selected.c selected.h Log Message: Added background to forms and extracted some better behavior from selected items. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- form.c 1 Jul 2004 18:31:22 -0000 1.5 +++ form.c 5 Jul 2004 02:40:45 -0000 1.6 @@ -92,6 +92,10 @@ widget_selected = 1; } + if( form->popup ) { + ewl_widget_destroy(form->popup); + form->popup = NULL; + } } static void @@ -105,9 +109,14 @@ ecore_list_goto_first( form->selected ); while( (c_s = ecore_list_next(form->selected)) ) { +#if 0 ewl_object_request_position(EWL_OBJECT(c_s), ev->x - dragging.x - 8, ev->y - dragging.y - 8); +#endif + ewl_object_request_position(EWL_OBJECT(c_s), + ev->x - dragging.x, + ev->y - dragging.y); } } } @@ -115,24 +124,26 @@ static void __mouse_up_widget( Ewl_Widget *w, void *ev_data, void *user_data ) { - Ewler_Form *form = EWLER_FORM(user_data); + Ewler_Form *form = user_data; Ewl_Event_Mouse_Up *ev = ev_data; - Ewl_Widget *c_s, *c_w; + Ewl_Widget *c_s; if( dragging.active ) { ecore_list_goto_first( form->selected ); while( (c_s = ecore_list_next( form->selected )) ) { +#if 0 ewl_object_request_position(EWL_OBJECT(c_s), ev->x - dragging.x - 8, ev->y - dragging.y - 8); +#endif + ewl_object_request_position(EWL_OBJECT(c_s), + ev->x - dragging.x, + ev->y - dragging.y); widget_changed(ewler_selected_get(EWLER_SELECTED(c_s))); } dragging.x = dragging.y = 0; dragging.active = 0; - - c_w = ewler_selected_get(EWLER_SELECTED(c_s)); - } } @@ -146,6 +157,18 @@ } static void +__mouse_move_form( Ewl_Widget *w, void *ev_data, void *user_data ) +{ + Ewler_Form *form = user_data; + Ewl_Widget *c_s; + + ecore_list_goto_first( form->selected ); + + while( (c_s = ecore_list_next( form->selected )) ) + ewl_callback_call_with_event_data(c_s, EWL_CALLBACK_MOUSE_MOVE, ev_data); +} + +static void __mouse_down_form( Ewl_Widget *w, void *ev_data, void *user_data ) { Ewl_Event_Mouse_Down *ev = ev_data; @@ -154,6 +177,11 @@ Ewler_Form *form = EWLER_FORM(user_data); static char widget_name_buf[256]; + if( form->popup ) { + ewl_widget_destroy(form->popup); + form->popup = NULL; + } + switch( ev->button ) { case 1: if( !widget_selected ) { @@ -205,10 +233,12 @@ break; case 2: break; case 3: - form->popup = ewl_menu_new(NULL, "configure"); + form->popup = ewl_imenu_new(NULL, "configure"); ewl_object_request_position(EWL_OBJECT(form->popup), ev->x, ev->y); - ewl_container_append_child(EWL_CONTAINER(form->window), form->popup); + ewl_object_set_fill_policy(EWL_OBJECT(form->popup), EWL_FLAG_FILL_NONE); + ewl_container_append_child(EWL_CONTAINER(form->overlay), form->popup); ewl_widget_show(form->popup); + ewl_callback_call(form->popup, EWL_CALLBACK_SELECT); menu_item = ewl_menu_item_new(NULL, "conf item"); ewl_container_append_child(EWL_CONTAINER(form->popup), menu_item); @@ -227,6 +257,22 @@ } void +form_set_widget_dragging( Ewl_Widget *w, Ewl_Event_Mouse_Down *ev ) +{ + dragging.x = ev->x - CURRENT_X(w); + dragging.y = ev->y - CURRENT_Y(w); + dragging.active = 1; + + widget_selected = 1; +} + +void +form_clear_widget_dragging( void ) +{ + dragging.active = 0; +} + +void form_add_widget( Ewler_Form *form, char *name, Ewl_Widget *w ) { ewl_callback_del_type( w, EWL_CALLBACK_CLICKED ); @@ -265,15 +311,23 @@ form->overlay = ewl_overlay_new(); - ewl_object_set_fill_policy( EWL_OBJECT(form->overlay), EWL_FLAG_FILL_ALL ); + ewl_widget_set_appearance(form->overlay, "background"); + ewl_theme_data_set_str(form->overlay, "/background/file", + PACKAGE_DATA_DIR"/themes/ewler.eet"); + ewl_theme_data_set_str(form->overlay, "/background/group", "background"); + + ewl_object_set_fill_policy( EWL_OBJECT(form->overlay), EWL_FLAG_FILL_FILL ); widget_create_info( form->overlay, "Ewl_Overlay", strdup( buf ) ); ewl_callback_append( form->overlay, EWL_CALLBACK_MOUSE_DOWN, __mouse_down_form, form ); + ewl_callback_append( form->overlay, EWL_CALLBACK_MOUSE_MOVE, + __mouse_move_form, form ); ewl_callback_append( form->overlay, EWL_CALLBACK_FOCUS_IN, __mouse_in_form, form ); ewl_callback_append( form->overlay, EWL_CALLBACK_MOUSE_MOVE, __mouse_move_widget, form ); ewl_container_append_child( EWL_CONTAINER(form->window), form->overlay ); + ewl_widget_set_data( form->overlay, "unsizable", (void *) 1 ); ewl_widget_show( form->overlay ); form->selected = ecore_list_new(); @@ -283,6 +337,7 @@ form->has_been_saved = 0; form->dirty = 0; form->cnt = 0; + form->popup = NULL; count++; =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- selected.c 1 Jul 2004 18:31:22 -0000 1.6 +++ selected.c 5 Jul 2004 02:40:46 -0000 1.7 @@ -8,6 +8,9 @@ #include "form.h" #include "selected.h" +#define SELECTED_MIN_WIDTH 15 +#define SELECTED_MIN_HEIGHT 15 + /** * @param w: the child widget to be selected * @return Returns NULL on failure, or a newly allocated selected on success. @@ -61,18 +64,20 @@ ewl_theme_data_set_str(sw, "/selected/file", PACKAGE_DATA_DIR"/themes/ewler.eet"); ewl_theme_data_set_str(sw, "/selected/group", "selected"); +#if 0 ewl_object_set_insets(EWL_OBJECT(s), 4, 4, 4, 4); -#if 0 - ewl_container_insert_child(parent, sw, index); - ewl_container_append_child(EWL_CONTAINER(s), w); -#endif ewl_container_append_child(parent, sw); ewl_object_request_geometry(EWL_OBJECT(s), CURRENT_X(w) - 8, CURRENT_Y(w) - 8, CURRENT_W(w) + 8, CURRENT_H(w) + 8); +#endif + ewl_container_insert_child(parent, sw, s->index); + ewl_object_request_geometry(EWL_OBJECT(s), + CURRENT_X(w), CURRENT_Y(w), + CURRENT_W(w), CURRENT_H(w)); ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_NONE); - ewl_widget_set_layer(sw, ewl_widget_get_layer(s->selected) + 1); + ewl_widget_set_layer(sw, 10000); ewl_callback_append(sw, EWL_CALLBACK_CONFIGURE, ewler_selected_configure_cb, NULL); @@ -88,6 +93,12 @@ ewler_selected_mouse_down_cb, NULL); ewl_callback_append(sw, EWL_CALLBACK_MOUSE_UP, ewler_selected_mouse_up_cb, NULL); + ewl_container_intercept_callback(EWL_CONTAINER(sw), EWL_CALLBACK_MOUSE_DOWN); + + if( ewl_object_get_preferred_w(EWL_OBJECT(w)) < SELECTED_MIN_WIDTH && + ewl_object_get_preferred_h(EWL_OBJECT(w)) < SELECTED_MIN_HEIGHT ) + ewl_object_set_preferred_size(EWL_OBJECT(w), + SELECTED_MIN_WIDTH, SELECTED_MIN_HEIGHT); s->index = index; s->selected = w; @@ -122,13 +133,21 @@ /* the width comes in from the selected, the position is set by the parent */ ewl_object_get_preferred_size(EWL_OBJECT(s->selected), &width, &height); +#if 0 x = CURRENT_X(s) + 4; y = CURRENT_Y(s) + 4; +#endif + x = CURRENT_X(s); + y = CURRENT_Y(s); if( x != CURRENT_X(s->selected) || y != CURRENT_Y(s->selected) ) ewl_object_request_position(EWL_OBJECT(s->selected), x, y); +#if 0 if( width != (CURRENT_W(s)-8) || height != (CURRENT_H(s)-8) ) ewl_object_set_preferred_size(EWL_OBJECT(s), width + 8, height + 8); +#endif + if( width != CURRENT_W(s) || height != CURRENT_H(s) ) + ewl_object_set_preferred_size(EWL_OBJECT(s), width, height); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -137,8 +156,17 @@ ewler_selected_selector_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data) { + Ewler_Selected *s; + DENTER_FUNCTION(DLEVEL_STABLE); + s = EWLER_SELECTED(w); + + ewl_container_append_child(EWL_CONTAINER(s), s->selected); + + if( ewl_widget_get_data( s->selected, "unsizable" ) ) + return; + edje_object_signal_callback_add(w->theme_object, "down", "top_left", ewler_selected_part_down, w); @@ -206,8 +234,12 @@ ewl_object_get_preferred_size(EWL_OBJECT(s->selected), &width, &height); +#if 0 ewl_object_request_size(EWL_OBJECT(s), width + 8, height + 8); ewl_object_set_preferred_size(EWL_OBJECT(s), width + 8, height + 8); +#endif + ewl_object_request_size(EWL_OBJECT(s), width, height); + ewl_object_set_preferred_size(EWL_OBJECT(s), width, height); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -223,11 +255,13 @@ s = EWLER_SELECTED(w); ewl_object_get_current_geometry(EWL_OBJECT(s), &x, &y, &width, &height); -#if 0 ewl_container_insert_child(EWL_CONTAINER(w->parent), s->selected, s->index); -#endif +#if 0 ewl_object_request_geometry(EWL_OBJECT(s->selected), x + 8, y + 8, width - 8, height - 8); +#endif + ewl_object_request_geometry(EWL_OBJECT(s->selected), + x, y, width, height); s->selected = NULL; s->index = -1; @@ -250,6 +284,8 @@ s->corners.y = CURRENT_Y(sw); s->corners.u = CURRENT_X(sw) + CURRENT_W(sw); s->corners.v = CURRENT_Y(sw) + CURRENT_H(sw); + + form_clear_widget_dragging(); } void @@ -277,17 +313,17 @@ if( s->dragging ) { if( strstr( s->dragging, "left" ) ) - s->corners.x = ev->x; + s->corners.x += ev->x - s->last_pos.x; if( strstr( s->dragging, "right" ) ) - s->corners.u = ev->x; + s->corners.u += ev->x - s->last_pos.x; if( strstr( s->dragging, "top" ) ) - s->corners.y = ev->y; + s->corners.y += ev->y - s->last_pos.y; if( strstr( s->dragging, "bottom" ) ) - s->corners.v = ev->y; + s->corners.v += ev->y - s->last_pos.y; - if( s->corners.u - s->corners.x < 0 ) + if( s->corners.u < s->corners.x ) s->corners.u = s->corners.x; - if( s->corners.v - s->corners.y < 0 ) + if( s->corners.v < s->corners.y ) s->corners.v = s->corners.y; ewl_object_request_position(EWL_OBJECT(s), s->corners.x, s->corners.y); @@ -295,10 +331,13 @@ s->corners.u - s->corners.x, s->corners.v - s->corners.y); ewl_object_set_preferred_size(EWL_OBJECT(s->selected), - s->corners.u - s->corners.x - 8, - s->corners.v - s->corners.y - 8); + s->corners.u - s->corners.x, + s->corners.v - s->corners.y); } + + s->last_pos.x = ev->x; + s->last_pos.y = ev->y; } void @@ -306,19 +345,33 @@ { Ewl_Embed *embed; Ewl_Event_Mouse_Down *ev = ev_data; + Ewler_Selected *s = EWLER_SELECTED(w); + static int second_time = 0; int x, y; x = ev->x; y = ev->y; - if( (x <= (CURRENT_X(w) + 4) || x >= (CURRENT_X(w) + CURRENT_W(w) - 4)) || - (y <= (CURRENT_Y(w) + 4) || y >= (CURRENT_Y(w) + CURRENT_H(w) - 4)) ) { - form_set_widget_selected(); + if( second_time ) + return; + + form_set_widget_dragging( s->selected, ev ); + embed = ewl_embed_find_by_widget(w); - embed = ewl_embed_find_by_widget(w); + evas_event_feed_mouse_down(embed->evas, ev->button); +#if 0 + ewl_container_nointercept_callback(EWL_CONTAINER(s), + EWL_CALLBACK_MOUSE_DOWN); + form_set_widget_selected(); + + second_time = 1; + ewl_embed_feed_mouse_down(embed, ev->button, ev->clicks, + ev->x, ev->y, ev->modifiers); + second_time = 0; - evas_event_feed_mouse_down(embed->evas, ev->button); - } + ewl_container_intercept_callback(EWL_CONTAINER(s), + EWL_CALLBACK_MOUSE_DOWN); +#endif } void =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- selected.h 1 Jul 2004 18:31:22 -0000 1.4 +++ selected.h 5 Jul 2004 02:40:46 -0000 1.5 @@ -13,6 +13,9 @@ int x, y; /* top left */ int u, v; /* lower right */ } corners; + struct { + int x, y; + } last_pos; int index; }; @@ -25,6 +28,8 @@ void ewler_selected_selector_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewler_selected_deselect_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewler_selected_focus_out_cb(Ewl_Widget *w, void *ev_data, + void *user_data); void ewler_selected_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewler_selected_mouse_move_cb(Ewl_Widget *w, void *ev_data, |
From: <enl...@li...> - 2004-07-05 02:43:38
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes/ewler/bits/images Added Files: Makefile.am bg.png Log Message: Added background to forms and extracted some better behavior from selected items. |
From: <enl...@li...> - 2004-07-05 02:47:06
|
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/themes Modified Files: ewler.edc Log Message: Added background to forms and extracted some better behavior from selected items. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/data/themes/ewler.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewler.edc 9 Jun 2004 20:17:23 -0000 1.1 +++ ewler.edc 5 Jul 2004 02:40:45 -0000 1.2 @@ -2,6 +2,11 @@ item, "/selected/group" "selected"; } +images { +#include "ewler/bits/background-images.edc" +} + collections { #include "ewler/bits/selected-groups.edc" +#include "ewler/bits/background-groups.edc" } |