Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_background.c e_int_config_theme.c
Log Message:
use zone geom, not xrander screen info
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_int_config_background.c 30 Apr 2006 04:31:42 -0000 1.46
+++ e_int_config_background.c 1 May 2006 09:11:16 -0000 1.47
@@ -276,8 +276,6 @@
Evas_List *bg_dirs, *bg;
Ecore_Evas *eebuf;
Evas *evasbuf;
- E_Manager *man;
- Ecore_X_Screen_Size size;
const char *f;
char *c;
@@ -313,9 +311,9 @@
i++;
}
- man = e_manager_current_get();
- size = ecore_x_randr_current_screen_size_get(man->root);
- im = e_widget_preview_add(cfd->dia->win->evas, 320, 320 * size.height /
size.width);
+ im = e_widget_preview_add(cfd->dia->win->evas, 320,
+ (320 * cfd->dia->win->border->zone->w) /
+ cfd->dia->win->border->zone->h);
e_widget_preview_edje_set(im, f, "desktop/background");
evas_object_del(bg_obj);
// im = e_widget_preview_add_from_object(cfd->dia->win->evas, bg_obj, 320,
240);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_theme.c 30 Apr 2006 04:31:42 -0000 1.23
+++ e_int_config_theme.c 1 May 2006 09:11:16 -0000 1.24
@@ -132,8 +132,6 @@
Ecore_Evas *eebuf;
Evas *evasbuf;
Evas_List *l, *paths;
- E_Manager *man;
- Ecore_X_Screen_Size size;
theme = edje_object_add(evas);
@@ -148,9 +146,6 @@
evasbuf = ecore_evas_get(eebuf);
o2 = edje_object_add(evasbuf);
- man = e_manager_current_get();
- size = ecore_x_randr_current_screen_size_get(man->root);
-
paths = e_path_dir_list_get(path_themes);
for (l = paths; l; l = l->next)
{
@@ -222,7 +217,9 @@
if (!(strcmp(themefile, cfdata->current_theme)))
{
selnum = i;
- im = e_widget_preview_add(evas, 320, 320 * size.height /
size.width);
+ im = e_widget_preview_add(evas, 320,
+ (320 *
cfd->dia->win->border->zone->w) /
+
cfd->dia->win->border->zone->h);
e_widget_preview_edje_set(im, fulltheme,
"desktop/background");
// im = e_widget_image_add_from_object(evas, theme, 320,
240);
// e_widget_image_object_set(im,
e_thumb_evas_object_get(fulltheme, evas, 320, 240, 1));
@@ -244,7 +241,9 @@
if (im == NULL)
{
snprintf(fulltheme, sizeof(fulltheme),
PACKAGE_DATA_DIR"/data/themes/default.edj");
- im = e_widget_preview_add(evas, 320, 320 * size.height / size.width);
+ im = e_widget_preview_add(evas, 320,
+ (320 * cfd->dia->win->border->zone->w) /
+ cfd->dia->win->border->zone->h);
e_widget_preview_edje_set(im, fulltheme, "desktop/background");
// theme = e_thumb_generate_begin(fulltheme, 320, 240, evas, &theme, NULL,
NULL);
// im = e_widget_image_add_from_object(evas, theme, 320, 240);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
