Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_iconbox.c
Log Message:
* Make icon_add and arrange algorithms agree with each other
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- ewl_iconbox.c 29 Dec 2005 19:37:43 -0000 1.100
+++ ewl_iconbox.c 9 Jan 2006 08:42:28 -0000 1.101
@@ -381,8 +381,6 @@
/* -------------------------------- */
ewl_widget_show(ib->select);
- /*ewl_widget_show(ib->select_floater);*/
-
/*Init the icon list*/
ib->ewl_iconbox_icon_list = ecore_list_new();
@@ -405,7 +403,6 @@
ib->entry_floater = ewl_floater_new();
ewl_floater_follow_set(EWL_FLOATER(ib->entry_floater),
ib->ewl_iconbox_pane_inner);
- /*ewl_widget_show(ib->entry_floater);*/
ib->entry_box = ewl_hbox_new();
ewl_widget_show(ib->entry_box);
ewl_container_child_append(EWL_CONTAINER(ib->entry_floater),
ib->entry_box);
@@ -1032,7 +1029,7 @@
ewl_object_current_size_get(EWL_OBJECT(iconbox->ewl_iconbox_scrollpane),
&sw,&sh);
- if ((iconbox->lx + iconbox->iw + (EWL_ICONBOX_ICON_PADDING)) >= (sw -
iconbox->iw)) {
+ if ( (iconbox->lx + ((iconbox->iw + EWL_ICONBOX_ICON_PADDING)*2)) >=
(sw - iconbox->iw)) {
//printf("%d + %d + %d >= %d, so next line (%s)\n",
//iconbox->lx , iconbox->iw , (EWL_ICONBOX_ICON_PADDING*2) ,
sw, name);
@@ -1419,11 +1416,14 @@
&& (ib->xdown != ev->x
&& ib->ydown != ev->y))
{
+ ewl_widget_show(ib->ewl_iconbox_menu_floater);
ewl_floater_position_set(EWL_FLOATER(ib->ewl_iconbox_menu_floater),
ev->x-ibx +
abs(px-ibx),
ev->y-iby +abs(py-iby));
ewl_callback_call(EWL_WIDGET(ib->ewl_iconbox_context_menu),
EWL_CALLBACK_FOCUS_IN);
+
+
ewl_object_state_remove(EWL_OBJECT(ib->ewl_iconbox_menu_floater),
EWL_FLAG_STATE_PRESSED);
} else if (ev->button == 1 /* Confirm that this is not an icon event */
&& (ib->xdown != ev->x
&& ib->ydown != ev->y))
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
