vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

illume2 - work, toolbart - short labels, ok 

SVN revision: 42030
This commit is contained in:
Carsten Haitzler 2009-08-27 09:26:13 +00:00
parent cd01fb813b
commit e020fbb290
3 changed files with 86 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/themes/default.edc
View File

@ -5618,8 +5618,8 @@ collections { /* begin the collection of edje groups that are in this file */
type: SWALLOW;
description { state: "default" 0.0;
align: 0.5 0.5;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
// aspect: 1.0 1.0;
// aspect_preference: VERTICAL;
rel1 {
relative: 0.0 0.0;
offset: 2 2;

77
src/bin/e_test.c
View File

@ -728,7 +728,15 @@ _e_test_internal(E_Container *con)
e_win_resize(dia->win, 400, 400);
}
static void
_e_test_internal(E_Container *con)
{
ecore_timer_add(1.0, _e_test_timer, con);
}
#elif 0
static int
_e_test_timer(void *data)
{
@ -787,11 +795,80 @@ _e_test_timer(void *data)
return 0;
}
static void
_e_test_internal(E_Container *con)
{
ecore_timer_add(1.0, _e_test_timer, con);
}
#elif 0
static int
_e_test_timer(void *data)
{
E_Container *con;
E_Dialog *dia;
Evas_Object *o, *ic;
Evas_Coord mw, mh;
con = data;
dia = e_dialog_new(con, "E", "_test");
e_dialog_title_set(dia, "A Test Dialog");
o = e_widget_toolbar_add(dia->win->evas, 48, 48);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_hdd.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_cd.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_desktop.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_home.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_root.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_tmp.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_globe.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_mixer.png");
e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
ic = e_icon_add(dia->win->evas);
e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_performance.png");
e_widget_toolbar_item_append(o, ic, "x", NULL, NULL, NULL);
e_widget_toolbar_scrollable_set(o, 1);
e_widget_toolbar_item_select(o, 1);
/* fixme... more */
e_widget_min_size_get(o, &mw, &mh);
e_dialog_content_set(dia, o, mw, mh);
evas_object_show(o);
/* buttons at the bottom */
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_dialog_resizable_set(dia, 1);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
e_win_resize(dia->win, 400, 200);
return 0;
}
static void
_e_test_internal(E_Container *con)
{
ecore_timer_add(1.0, _e_test_timer, con);
}
#else
static void
_e_test_internal(E_Container *con)

14
src/modules/illume2/e_mod_layout_illume.c
View File

@ -40,9 +40,9 @@ _zone_layout(E_Zone *z)
{
int mw, mh;
if (bd->zone != z) continue;
if (bd->new_client) continue;
if (!bd->visible) continue;
if (bd->zone != z) continue; // skip other zones
if (bd->new_client) continue; // skip new clients
if (!bd->visible) continue; // skip invisible
illume_border_min_get(bd, &mw, &mh);
if (illume_border_is_top_shelf(bd))
@ -59,15 +59,15 @@ _zone_layout(E_Zone *z)
}
}
// actually apply the sizing, positioning and layering too
// phase 2. actually apply the sizing, positioning and layering too
borders = e_border_client_list();
EINA_LIST_FOREACH(borders, l, bd)
{
int mw, mh;
if (bd->zone != z) continue;
if (bd->new_client) continue;
if (!bd->visible) continue;
if (bd->zone != z) continue; // skip other zones
if (bd->new_client) continue; // skip new clients
if (!bd->visible) continue; // skip invisible
illume_border_min_get(bd, &mw, &mh);
if (illume_border_is_top_shelf(bd))