Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_dialog.c e_dialog.h e_file_dialog.c e_icon.c
e_scrollframe.c e_test.c
Log Message:
use elipsis for fileman icons.
some ilist work. more to come.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- e_apps.c 4 Nov 2005 07:49:12 -0000 1.101
+++ e_apps.c 6 Nov 2005 03:40:24 -0000 1.102
@@ -77,7 +77,7 @@
" image: \"%s\" COMP;\n" \
"}\n" \
"collections {\n" \
-" group {\n" \
+" group {\n" \
" name: \"icon\";\n" \
" max: %s %s;\n" \
" parts {\n" \
@@ -1430,7 +1430,7 @@
if (!app->scanned)
return;
- file = ecore_file_get_file((char *)path);
+ file = (char *)ecore_file_get_file((char *)path);
if (!strcmp(file, ".order"))
{
if ((event == ECORE_FILE_EVENT_CREATED_FILE)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_dialog.c 3 Nov 2005 06:17:08 -0000 1.29
+++ e_dialog.c 6 Nov 2005 03:40:24 -0000 1.30
@@ -151,6 +151,24 @@
}
void
+e_dialog_resizable_set(E_Dialog *dia, int resizable)
+{
+ dia->resizable = resizable;
+ if (dia->win)
+ {
+ if (resizable)
+ {
+ e_win_size_max_set(dia->win, 99999, 99999);
+ }
+ else
+ {
+ e_win_resize(dia->win, dia->min_w, dia->min_h);
+ e_win_size_max_set(dia->win, dia->min_w, dia->min_h);
+ }
+ }
+}
+
+void
e_dialog_show(E_Dialog *dia)
{
Evas_Coord mw, mh;
@@ -173,7 +191,10 @@
evas_object_resize(dia->bg_object, mw, mh);
e_win_resize(dia->win, mw, mh);
e_win_size_min_set(dia->win, mw, mh);
- e_win_size_max_set(dia->win, mw, mh);
+ dia->min_w = mw;
+ dia->min_h = mh;
+ if (!dia->resizable) e_win_size_max_set(dia->win, mw, mh);
+ else e_win_size_max_set(dia->win, 99999, 99999);
e_win_show(dia->win);
if (!e_widget_focus_get(dia->box_object))
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_dialog.h 16 Oct 2005 07:32:11 -0000 1.8
+++ e_dialog.h 6 Nov 2005 03:40:24 -0000 1.9
@@ -25,6 +25,8 @@
Evas_Object *event_object;
Evas_List *buttons;
void *data;
+ int min_w, min_h;
+ unsigned char resizable : 1;
};
EAPI E_Dialog *e_dialog_new (E_Container *con);
@@ -35,6 +37,7 @@
EAPI void e_dialog_text_set (E_Dialog *dia, char *text);
EAPI void e_dialog_icon_set (E_Dialog *dia, char *icon,
Evas_Coord size);
EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object
*obj, Evas_Coord minw, Evas_Coord minh);
+EAPI void e_dialog_resizable_set (E_Dialog *dia, int resizable);
EAPI void e_dialog_show (E_Dialog *dia);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_file_dialog.c 4 Nov 2005 21:05:57 -0000 1.6
+++ e_file_dialog.c 6 Nov 2005 03:40:24 -0000 1.7
@@ -69,8 +69,8 @@
void
e_file_dialog_show(E_File_Dialog *dia)
{
+ e_dialog_resizable_set(dia->dia, 1);
e_dialog_show(dia->dia);
- e_win_size_max_set(dia->dia->win, 9999, 9999);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_icon.c 4 Nov 2005 20:36:05 -0000 1.8
+++ e_icon.c 6 Nov 2005 03:40:24 -0000 1.9
@@ -80,7 +80,7 @@
sd = evas_object_smart_data_get(obj);
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
{
- edje_object_file_get(sd->obj, &file, NULL);
+ edje_object_file_get(sd->obj, (const char **)&file, NULL);
return file;
}
evas_object_image_file_get(sd->obj, &file, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_scrollframe.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_scrollframe.c 3 Nov 2005 11:34:55 -0000 1.5
+++ e_scrollframe.c 6 Nov 2005 03:40:24 -0000 1.6
@@ -217,6 +217,7 @@
e_scrollframe_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w,
Evas_Coord *h)
{
API_ENTRY return;
+ edje_object_calc_force(sd->edje_obj);
evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_test.c 5 Nov 2005 13:54:43 -0000 1.37
+++ e_test.c 6 Nov 2005 03:40:24 -0000 1.38
@@ -411,6 +411,20 @@
}
static void
+_e_test_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Coord mw, mh, vw, vh, w, h;
+
+ e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
+ e_ilist_min_size_get(data, &mw, &mh);
+ evas_object_geometry_get(data, NULL, NULL, &w, &h);
+ if (vw >= mw)
+ {
+ if (w != vw) evas_object_resize(data, vw, h);
+ }
+}
+
+static void
_e_test_internal(E_Container *con)
{
E_Dialog *dia;
@@ -464,14 +478,16 @@
evas_object_show(o);
o2 = e_scrollframe_add(dia->win->evas);
+ evas_object_event_callback_add(o2, EVAS_CALLBACK_RESIZE, _e_test_resize, o);
evas_object_resize(o2, mw, 150);
evas_object_show(o2);
e_scrollframe_child_set(o2, o);
e_scrollframe_child_viewport_size_get(o2, &vw, &vh);
- e_dialog_content_set(dia, o2, mw + (mw - vw), 150);
+ e_dialog_content_set(dia, o2, 200, 150);
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_win_centered_set(dia->win, 1);
+ e_dialog_resizable_set(dia, 1);
e_dialog_show(dia);
tmp.ilist = o;
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
