forked from enlightenment/enlightenment
Populate the toolbar when it gets created.
Added start of orientation support. SVN revision: 32523
This commit is contained in:
parent
bf03226559
commit
96d567024e
|
@ -11,6 +11,7 @@ static void _e_toolbar_menu_cb_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||||
static void _e_toolbar_menu_cb_config(void *data, E_Menu *mn, E_Menu_Item *mi);
|
static void _e_toolbar_menu_cb_config(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||||
static void _e_toolbar_menu_cb_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
|
static void _e_toolbar_menu_cb_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||||
static void _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
static void _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
||||||
|
static const char *_e_toolbar_orient_string_get(E_Toolbar *tbar);
|
||||||
|
|
||||||
/* local vars */
|
/* local vars */
|
||||||
static Evas_List *toolbars = NULL;
|
static Evas_List *toolbars = NULL;
|
||||||
|
@ -38,6 +39,7 @@ EAPI E_Toolbar *
|
||||||
e_toolbar_new(Evas *evas, const char *name)
|
e_toolbar_new(Evas *evas, const char *name)
|
||||||
{
|
{
|
||||||
E_Toolbar *tbar = NULL;
|
E_Toolbar *tbar = NULL;
|
||||||
|
char buf[4096];
|
||||||
|
|
||||||
if (!name) return NULL;
|
if (!name) return NULL;
|
||||||
|
|
||||||
|
@ -66,10 +68,14 @@ e_toolbar_new(Evas *evas, const char *name)
|
||||||
e_gadcon_size_request_callback_set(tbar->gadcon, _e_toolbar_gadcon_size_request, tbar);
|
e_gadcon_size_request_callback_set(tbar->gadcon, _e_toolbar_gadcon_size_request, tbar);
|
||||||
/* FIXME: We want to implement "styles" here ? */
|
/* FIXME: We want to implement "styles" here ? */
|
||||||
|
|
||||||
|
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
||||||
|
_e_toolbar_orient_string_get(tbar));
|
||||||
e_gadcon_orient(tbar->gadcon, E_GADCON_ORIENT_TOP);
|
e_gadcon_orient(tbar->gadcon, E_GADCON_ORIENT_TOP);
|
||||||
/* TODO: Send signals to theme obj */
|
edje_object_signal_emit(tbar->o_base, buf, "e");
|
||||||
|
edje_object_message_signal_process(tbar->o_base);
|
||||||
|
|
||||||
e_gadcon_toolbar_set(tbar->gadcon, tbar);
|
e_gadcon_toolbar_set(tbar->gadcon, tbar);
|
||||||
|
e_gadcon_populate(tbar->gadcon);
|
||||||
|
|
||||||
toolbars = evas_list_append(toolbars, tbar);
|
toolbars = evas_list_append(toolbars, tbar);
|
||||||
return tbar;
|
return tbar;
|
||||||
|
@ -270,9 +276,7 @@ _e_toolbar_menu_cb_contents(void *data, E_Menu *mn, E_Menu_Item *mi)
|
||||||
E_Toolbar *tbar;
|
E_Toolbar *tbar;
|
||||||
|
|
||||||
tbar = data;
|
tbar = data;
|
||||||
#if 0
|
|
||||||
if (!tbar->gadcon->config_dialog) e_int_gadcon_config(tbar->gadcon);
|
if (!tbar->gadcon->config_dialog) e_int_gadcon_config(tbar->gadcon);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -310,3 +314,34 @@ _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coor
|
||||||
}
|
}
|
||||||
e_toolbar_move_resize(tbar, nx, ny, nw, nh);
|
e_toolbar_move_resize(tbar, nx, ny, nw, nh);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const char *
|
||||||
|
_e_toolbar_orient_string_get(E_Toolbar *tbar)
|
||||||
|
{
|
||||||
|
const char *sig = "";
|
||||||
|
|
||||||
|
switch (tbar->gadcon->orient)
|
||||||
|
{
|
||||||
|
case E_GADCON_ORIENT_HORIZ:
|
||||||
|
sig = "horizontal";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_VERT:
|
||||||
|
sig = "vertical";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_LEFT:
|
||||||
|
sig = "left";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
|
sig = "right";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_TOP:
|
||||||
|
sig = "top";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
|
sig = "bottom";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return sig;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue