Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_box.c ewl_entry.c
Log Message:
Switch to homogeneous box show callback.
More multiline work.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ewl_box.c 19 Aug 2004 20:03:32 -0000 1.71
+++ ewl_box.c 1 Oct 2004 19:44:46 -0000 1.72
@@ -166,12 +166,13 @@
DRETURN(DLEVEL_STABLE);
b->orientation = o;
- /*
- if (o == EWL_ORIENTATION_HORIZONTAL)
- ewl_widget_appearance_set(w, "hbox");
+ if (b->homogeneous)
+ ewl_box_child_homogeneous_show_cb(EWL_CONTAINER(b),
+
ecore_list_goto_first(EWL_CONTAINER(b)->children));
else
- ewl_widget_appearance_set(w, "vbox");
- */
+ ewl_box_child_show_cb(EWL_CONTAINER(b),
+
ecore_list_goto_first(EWL_CONTAINER(b)->children));
+
ewl_widget_configure(w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- ewl_entry.c 27 Sep 2004 04:56:17 -0000 1.108
+++ ewl_entry.c 1 Oct 2004 19:44:46 -0000 1.109
@@ -107,8 +107,10 @@
ewl_entry_mouse_down_cb, NULL);
ewl_callback_del(w, EWL_CALLBACK_MOUSE_UP,
ewl_entry_mouse_up_cb);
+ /*
ewl_callback_append(w, EWL_CALLBACK_DOUBLE_CLICKED,
ewl_entry_mouse_double_click_cb, NULL);
+ */
ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE,
ewl_entry_mouse_move_cb, NULL);
@@ -283,7 +285,7 @@
l = ewl_text_length_get(EWL_TEXT(w));
c_pos = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor));
- if (c_pos >= l)
+ if (c_pos > l)
pos = l - 1;
else
pos = c_pos;
@@ -315,6 +317,7 @@
if (!ch)
ch = CURRENT_H(e->cursor);
+ printf("Map %d of %d to %d, %d: %d x %d\n", c_pos, l, cx, cy, cw, ch);
ewl_object_geometry_request(EWL_OBJECT(e->cursor), cx, cy,
cw, ch);
}
@@ -384,7 +387,7 @@
{
Ewl_Event_Mouse_Down *ev;
Ewl_Entry *e;
- int index = 0, len = 0;
+ int index = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -394,19 +397,11 @@
e->in_select_mode = TRUE;
- len = ewl_text_length_get(EWL_TEXT(e->text));
- if (ev->x < CURRENT_X(e->text))
- index = 0;
-
- else if (ev->x > CURRENT_X(e->text) + CURRENT_W(e->text))
- index = len;
-
- else
- index = ewl_text_coord_index_map(EWL_TEXT(e->text), ev->x, ev->y);
+ index = ewl_text_coord_index_map(EWL_TEXT(e->text), ev->x, ev->y);
if (!e->selection)
e->selection = ewl_entry_selection_new();
-
+
ewl_entry_selection_start_position_set(EWL_ENTRY_SELECTION(e->selection),
index);
ewl_entry_selection_end_position_set(EWL_ENTRY_SELECTION(e->selection), index);
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
