vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use zone geom, not xrander screen info 

SVN revision: 22433
This commit is contained in:
Carsten Haitzler 2006-05-01 09:11:16 +00:00
parent e0cc92221c
commit bed8ea9701
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_int_config_background.c
View File

@ -276,8 +276,6 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
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 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
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);

13
src/bin/e_int_config_theme.c
View File

@ -132,8 +132,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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);