Enlightenment CVS committal
Author : sebastid
Project : misc
Module : embrace
Dir : misc/embrace/src/module
Modified Files:
embrace.c
Log Message:
It works!!
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/module/embrace.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- embrace.c 24 Aug 2005 21:23:51 -0000 1.1
+++ embrace.c 24 Aug 2005 22:22:32 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: embrace.c,v 1.1 2005/08/24 21:23:51 sebastid Exp $
+ * $Id: embrace.c,v 1.2 2005/08/24 22:22:32 sebastid Exp $
*
* Copyright (C) 2004 Embrace project.
*
@@ -257,15 +257,29 @@
if ((mailbox = load_mailbox (e, edb, i))) {
mailbox_emit_add (mailbox);
edje = mailbox_edje_get (mailbox);
+
+ h = mailbox_height_get (mailbox);
+ w = mailbox_width_get (mailbox);
+
e_box_pack_end (e->gui.container, edje);
+ e_box_pack_options_set (edje,
+ 1, 1, /* fill */
+ 0, 0, /* expand */
+ 0.5, 0.5, /* align */
+ w, h, /* min */
+ w, h /* max */
+ );
e->mailboxes = evas_list_append (e->mailboxes, mailbox);
-
- h += mailbox_height_get (mailbox);
- w = mailbox_width_get (mailbox);
}
- evas_object_resize (e->gui.container, w, h);
+ e_box_min_size_get(e->gui.container, &w, &h);
+ evas_object_resize(e->gui.container, w, h);
+ edje_extern_object_min_size_set(e->gui.container, w, h);
+ edje_object_part_swallow (e->gui.edje, "Container",
+ e->gui.container);
+ edje_object_size_min_calc(e->gui.edje, &w, &h);
+ evas_object_resize (e->gui.edje, w, h);
return evas_list_count (e->mailboxes);
}
@@ -291,7 +305,7 @@
snprintf (eet, sizeof (eet), DATA_DIR "/themes/%s.edj", name);
- return stat(eet, &st) ? NULL : eet;
+ return stat (eet, &st) ? NULL : eet;
}
static bool config_load_misc (Embrace *e, E_DB_File *edb)
@@ -377,8 +391,6 @@
static bool ui_load_edje (Embrace *e)
{
- Evas_Coord w = 0, h = 0;
-
assert (e);
if (!(e->gui.edje = edje_object_add (e->gui.evas)))
@@ -392,10 +404,8 @@
return false;
}
- /* set min/max sizes */
- edje_object_size_min_get (e->gui.edje, &w, &h);
evas_object_move (e->gui.edje, 0, 0);
- evas_object_resize (e->gui.edje, w, h);
+ evas_object_resize (e->gui.edje, 400, 400);
evas_object_pass_events_set (e->gui.edje, true);
evas_object_show (e->gui.edje);
@@ -415,14 +425,15 @@
if (!(e->gui.container = e_box_add (e->gui.evas)))
return false;
- e_box_orientation_set (e->gui.container, 1);
+ e_box_orientation_set (e->gui.container, 0);
+ e_box_align_set (e->gui.container, 0.0, 0.0);
edje_object_part_swallow (e->gui.edje, "Container",
e->gui.container);
evas_object_pass_events_set (e->gui.container, 1);
evas_object_move (e->gui.container, 0, 0);
- evas_object_resize (e->gui.container, 100, 100);
+ evas_object_resize (e->gui.container, 400, 400);
evas_object_show (e->gui.container);
return true;
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
