Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_iconbox.c
Log Message:
* Oops - bind to the right configure
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- ewl_iconbox.c 29 Nov 2005 07:24:32 -0000 1.86
+++ ewl_iconbox.c 29 Nov 2005 08:01:36 -0000 1.87
@@ -3,7 +3,7 @@
#include "ewl_macros.h"
#include "ewl_private.h"
-#define ICON_LABEL_INITIAL 50
+#define ICON_LABEL_INITIAL 80
int ewl_iconbox_icon_label_height_calculate(Ewl_IconBox_Icon* icon) {
@@ -20,7 +20,7 @@
void ewl_iconbox_icon_floater_resize(Ewl_Widget *w __UNUSED__, void *ev_data,
void* user_data) {
- Ewl_IconBox_Icon* icon = EWL_ICONBOX_ICON(w);
+ Ewl_IconBox_Icon* icon = EWL_ICONBOX_ICON(user_data);
int height = ewl_iconbox_icon_label_height_calculate(icon);
ewl_callback_del(w, EWL_CALLBACK_CONFIGURE,
ewl_iconbox_icon_floater_resize);
@@ -471,8 +471,6 @@
{
int wrap = 0;
- /*ewl_text_wrap_set(EWL_TEXT(icon->w_label), 1);*/
-
if (text) {
ewl_text_text_set(EWL_TEXT(icon->w_label), text);
@@ -491,8 +489,8 @@
/* Overestimate the label height to begin with, to give the text room
to expand */
if (REALIZED(EWL_WIDGET(icon))) {
- ewl_object_custom_h_set( EWL_OBJECT(icon->floater),
CURRENT_H(icon->image) + ICON_LABEL_INITIAL);
- ewl_callback_append(EWL_WIDGET(icon), EWL_CALLBACK_CONFIGURE,
ewl_iconbox_icon_floater_resize, icon);
+ ewl_object_custom_h_set( EWL_OBJECT(icon->floater),
CURRENT_H(icon->image) + ICON_LABEL_INITIAL);
+ ewl_callback_append(EWL_WIDGET(icon->w_label),
EWL_CALLBACK_CONFIGURE, ewl_iconbox_icon_floater_resize, icon);
}
}
-------------------------------------------------------
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
