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

* data/themes/default_configure.edc: 

- add min: 1 1; to text parts so they can control the edje's size.

* src/bin/e_configure.c:
  - better calculation of the min sizes for icons / window.


SVN revision: 16785
This commit is contained in:
codewarrior 2005-09-20 09:45:08 +00:00 committed by codewarrior
parent 0e96fd5484
commit 3a6ec75c22
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/themes/default_configure.edc
View File

@ -90,6 +90,7 @@ group {
size: 18;
font: "Edje-Vera";
align: 0.0 0.0;
min: 1 1;
}
}
}
@ -172,7 +173,8 @@ group {
text: "No Title";
align: 0.0 0.0;
size: 10;
font: "Edje-Vera";
font: "Edje-Vera";
min: 1 1;
}
}
}

31
src/bin/e_configure.c
View File

@ -36,7 +36,7 @@ _e_configure_cb_resize(E_Win *win)
static void
_e_configure_gui_show(E_Configure *app)
{
Evas_Coord w, h;
Evas_Coord w, h, ew, eh;
app->win = e_win_new(app->con);
e_win_delete_callback_set(app->win, _e_configure_gui_hide);
@ -45,12 +45,9 @@ _e_configure_gui_show(E_Configure *app)
e_win_name_class_set(app->win, "EConfigure", "EConfigure");
app->evas = e_win_evas_get(app->win);
ecore_evas_data_set(app->win->ecore_evas, "App", app);
e_win_resize(app->win, 370, 200);
e_win_resize_callback_set(app->win, _e_configure_cb_resize);
app->edje = edje_object_add(app->evas);
e_theme_edje_object_set(app->edje, "base/theme/configure", "configure/main");
@ -66,11 +63,19 @@ _e_configure_gui_show(E_Configure *app)
e_box_orientation_set(app->box, 1);
e_box_align_set(app->box, 0.0, 0.0);
edje_object_size_min_calc (app->edje, &ew, &eh);
e_box_min_size_get(app->box, &w, &h);
if (ew > w )
w = ew;
if (eh > h)
h = eh;
edje_extern_object_min_size_set(app->box, w, h);
e_win_size_base_set (app->win, w, h);
e_win_size_min_set (app->win, w, h);
e_win_size_base_set (app->win, w , h + eh);
e_win_size_min_set (app->win, w, h + eh);
e_win_resize(app->win, w, h + eh);
edje_object_part_swallow(app->edje, "icon_swallow", app->box);
evas_object_show(app->box);
@ -122,14 +127,20 @@ _e_configure_apps_load(E_Configure *app)
edje_object_part_swallow(o, "icon_swallow", icon);
edje_object_part_text_set(o, "title", a->name);
evas_object_show(icon);
evas_object_show(icon);
edje_object_size_min_calc (o, &w, &h);
edje_extern_object_min_size_set (o, w, h);
e_box_pack_end(app->box, o);
e_box_pack_options_set(o,
1, 0, /* fill */
1, 0, /* expand */
0.0, 0.0, /* align */
64, 64, /* min */
w, h, /* min */
999, 999 //172, 72 /* max */
);