Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_toolbar.c
Log Message:
Some minor fixes for toolbar on resize.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_toolbar.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_toolbar.c 11 Nov 2007 15:46:06 -0000 1.7
+++ e_toolbar.c 12 Nov 2007 20:59:10 -0000 1.8
@@ -18,6 +18,7 @@
static void _e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj, void
*event_info);
static void _e_toolbar_fm2_selected(void *data, Evas_Object *obj, void
*event_info);
static void _e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj,
void *event_info);
+static void _e_toolbar_menu_items_append(void *data, E_Menu *mn);
/* local vars */
static Evas_List *toolbars = NULL;
@@ -84,21 +85,21 @@
evas_object_resize(tbar->o_base, tbar->w, tbar->h);
e_theme_edje_object_set(tbar->o_base, "base/theme/toolbar",
"e/toolbar/default/base");
+ evas_object_show(tbar->o_base);
+
e_toolbar_move_resize(tbar, tbar->x, tbar->y, tbar->w, tbar->h);
-
+
tbar->gadcon = e_gadcon_swallowed_new(tbar->name, tbar->id, tbar->o_base,
"e.swallow.content");
e_gadcon_size_request_callback_set(tbar->gadcon,
_e_toolbar_gadcon_size_request, tbar);
/* 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);
- edje_object_signal_emit(tbar->o_base, buf, "e");
- edje_object_message_signal_process(tbar->o_base);
+ e_toolbar_orient(tbar, E_GADCON_ORIENT_TOP);
e_gadcon_toolbar_set(tbar->gadcon, tbar);
+ e_gadcon_util_menu_attach_func_set(tbar->gadcon,
+ _e_toolbar_menu_items_append, tbar);
e_gadcon_populate(tbar->gadcon);
toolbars = evas_list_append(toolbars, tbar);
@@ -340,6 +341,15 @@
}
static void
+_e_toolbar_menu_items_append(void *data, E_Menu *mn)
+{
+ E_Toolbar *tbar;
+
+ tbar = data;
+ _e_toolbar_menu_append(tbar, mn);
+}
+
+static void
_e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
{
E_Menu_Item *mi;
@@ -418,15 +428,13 @@
{
case E_GADCON_ORIENT_TOP:
case E_GADCON_ORIENT_BOTTOM:
- case E_GADCON_ORIENT_HORIZ:
w = ww;
h = 32;
break;
case E_GADCON_ORIENT_LEFT:
case E_GADCON_ORIENT_RIGHT:
- case E_GADCON_ORIENT_VERT:
- h = hh;
w = 32;
+ h = hh;
break;
default:
break;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
