Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c main.c
Log Message:
fixups suggested by tokyo
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- entice.c 27 Mar 2004 18:32:09 -0000 1.39
+++ entice.c 2 Apr 2004 22:53:47 -0000 1.40
@@ -175,24 +175,34 @@
edje_object_part_swallow(e->edje, "EnticeThumbnailArea",
e->container);
}
- if ((str = edje_object_data_get(o, "entice,window,type")))
+ if ((str = edje_object_data_get(o, "entice.window.type")))
{
+ fprintf(stderr, "%s entice.window.type\n", str);
if (!strcmp(str, "shaped"))
{
+ ecore_evas_borderless_set(ee, 1);
ecore_evas_shaped_set(ee, 1);
}
else if (!strcmp(str, "trans"))
{
- Evas_Object *trans = NULL;
-
- trans = esmart_trans_x11_new(ecore_evas_get(ee));
- evas_object_layer_set(trans, 0);
- evas_object_move(trans, 0, 0);
- evas_object_resize(trans, w, h);
- evas_object_name_set(trans, "trans");
-
- esmart_trans_x11_freshen(trans, x, y, w, h);
- evas_object_show(trans);
+ o = esmart_trans_x11_new(ecore_evas_get(ee));
+ evas_object_layer_set(o, 0);
+ evas_object_move(o, 0, 0);
+ evas_object_resize(o, w, h);
+ evas_object_name_set(o, "trans");
+
+ esmart_trans_x11_freshen(o, x, y, w, h);
+ evas_object_show(o);
+ ecore_evas_borderless_set(ee, 1);
+ }
+ else
+ {
+ o = evas_object_rectangle_add(ecore_evas_get(ee));
+ evas_object_color_set(o, 255, 255, 255, 255);
+ evas_object_resize(o, w, h);
+ evas_object_move(o, 0, 0);
+ evas_object_layer_set(o, 0);
+ evas_object_show(o);
}
}
}
@@ -382,12 +392,15 @@
if ((o = e_thumb_new(ecore_evas_get(entice->ee), buf)))
{
+ evas_object_layer_set(o,
+ evas_object_layer_get(entice->container));
edje = edje_object_add(ecore_evas_get(entice->ee));
if (edje_object_file_set
(edje, entice_config_theme_get(), "EnticeThumb"))
{
- evas_object_layer_set(o, 0);
- evas_object_layer_set(edje, 0);
+ evas_object_layer_set(edje,
+ evas_object_layer_get(entice->
+ container));
if (edje_object_part_exists(edje, "EnticeThumb"))
{
entice->thumb.list =
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- main.c 26 Jan 2004 05:07:32 -0000 1.21
+++ main.c 2 Apr 2004 22:53:49 -0000 1.22
@@ -194,6 +194,7 @@
{
int pnum = -1;
int x, y, w, h;
+ Ecore_Evas *ee = NULL;
if (argc > 1)
pnum = entice_pipe_foo(argc, (const char **) argv);
@@ -204,8 +205,6 @@
if (ecore_evas_init())
{
- Evas_Object *o = NULL;
- Ecore_Evas *ee = NULL;
edje_init();
edje_frametime_set(1.0 / 60.0);
@@ -231,8 +230,6 @@
ecore_evas_name_class_set(ee, "Entice", "Main");
ecore_evas_title_set(ee, "Entice !!!!");
- ecore_evas_borderless_set(ee, 0);
- ecore_evas_shaped_set(ee, 0);
evas_font_cache_set(ecore_evas_get(ee),
entice_config_font_cache_get() * 1024 * 1024);
@@ -242,13 +239,6 @@
evas_font_path_append(ecore_evas_get(ee),
PACKAGE_DATA_DIR "/fonts");
- o = evas_object_rectangle_add(ecore_evas_get(ee));
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_resize(o, 5555, 5555);
- evas_object_move(o, 0, 0);
- evas_object_layer_set(o, 0);
- evas_object_show(o);
-
entice_init(ee);
ecore_evas_move_resize(ee, x, y, w, h);
ecore_evas_show(ee);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
