Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/fileman
Modified Files:
e_fwin.c
Log Message:
Add module type to .desktop files.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_fwin.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_fwin.c 23 Oct 2007 22:40:54 -0000 1.14
+++ e_fwin.c 2 Nov 2007 06:22:24 -0000 1.15
@@ -40,7 +40,8 @@
const char *overlay_file;
const char *scrollframe_file;
const char *theme_file;
-
+
+ E_Toolbar *tbar;
Ecore_Event_Handler *zone_handler;
};
@@ -372,7 +373,10 @@
fwin->scrollframe_obj = o;
evas_object_move(o, 0, 0);
evas_object_show(o);
-
+
+ fwin->tbar = e_toolbar_new(e_win_evas_get(fwin->win), "toolbar");
+ e_toolbar_show(fwin->tbar);
+
o = edje_object_add(e_win_evas_get(fwin->win));
edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", o);
evas_object_pass_events_set(o, 1);
@@ -421,6 +425,9 @@
}
if (fwin->win) e_object_del(E_OBJECT(fwin->win));
if (fwin->fm_obj) evas_object_del(fwin->fm_obj);
+
+ if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar));
+
if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj);
if (fwin->zone)
@@ -465,8 +472,13 @@
else if (fwin->zone)
evas_object_resize(fwin->bg_obj, fwin->zone->w, fwin->zone->h);
}
- if (fwin->win)
- evas_object_resize(fwin->scrollframe_obj, fwin->win->w, fwin->win->h);
+ if (fwin->win)
+ {
+ e_toolbar_move_resize(fwin->tbar, 0, 0, fwin->win->w, fwin->tbar->h);
+ evas_object_move(fwin->scrollframe_obj, 0, fwin->tbar->h);
+ evas_object_resize(fwin->scrollframe_obj, fwin->win->w,
+ (fwin->win->h - fwin->tbar->h));
+ }
else if (fwin->zone)
evas_object_resize(fwin->scrollframe_obj, fwin->zone->w, fwin->zone->h);
}
-------------------------------------------------------------------------
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
