usscaling factor in some places - like icons in config panel, fileman and

shelf sizes. can be put in so so so many other places.



SVN revision: 36212
This commit is contained in:
Carsten Haitzler 2008-09-24 13:47:10 +00:00
parent 071ba50d45
commit ce1dc55d7b
4 changed files with 18 additions and 18 deletions

View File

@ -417,7 +417,7 @@ e_shelf_save(E_Shelf *es)
cf_es->overlap = 0; cf_es->overlap = 0;
cf_es->autohide = 0; cf_es->autohide = 0;
cf_es->hide_timeout = 1.0; cf_es->hide_timeout = 1.0;
cf_es->hide_duration = 1.0; cf_es->hide_duration = 1.0;
es->cfg = cf_es; es->cfg = cf_es;
} }
e_config_save_queue(); e_config_save_queue();
@ -459,7 +459,7 @@ e_shelf_position_calc(E_Shelf *es)
if (es->cfg) if (es->cfg)
{ {
orient = es->cfg->orient; orient = es->cfg->orient;
size = es->cfg->size; size = es->cfg->size * e_scale;
} }
else else
orient = es->gadcon->orient; orient = es->gadcon->orient;

View File

@ -149,7 +149,7 @@ e_configure_show(E_Container *con)
/* Category List */ /* Category List */
of = e_widget_framelist_add(eco->evas, _("Categories"), 1); of = e_widget_framelist_add(eco->evas, _("Categories"), 1);
eco->cat_list = e_widget_ilist_add(eco->evas, 32, 32, NULL); eco->cat_list = e_widget_ilist_add(eco->evas, 32 * e_scale, 32 * e_scale, NULL);
e_widget_ilist_selector_set(eco->cat_list, 1); e_widget_ilist_selector_set(eco->cat_list, 1);
/***--- fill ---***/ /***--- fill ---***/
_e_configure_fill_cat_list(eco); _e_configure_fill_cat_list(eco);
@ -159,7 +159,7 @@ e_configure_show(E_Container *con)
/* Item List */ /* Item List */
of = e_widget_framelist_add(eco->evas, _("Items"), 1); of = e_widget_framelist_add(eco->evas, _("Items"), 1);
eco->item_list = e_widget_ilist_add(eco->evas, 32, 32, NULL); eco->item_list = e_widget_ilist_add(eco->evas, 32 * e_scale, 32 * e_scale, NULL);
e_widget_ilist_selector_set(eco->item_list, 1); e_widget_ilist_selector_set(eco->item_list, 1);
e_widget_ilist_go(eco->item_list); e_widget_ilist_go(eco->item_list);
e_widget_on_focus_hook_set(eco->item_list, _e_configure_focus_cb, eco->win); e_widget_on_focus_hook_set(eco->item_list, _e_configure_focus_cb, eco->win);

View File

@ -169,11 +169,11 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Minimum")); ob = e_widget_label_add(evas, _("Minimum"));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.1f times"), 0.25, 8.0, 0.05, 0, &(cfdata->min), NULL, 150); ob = e_widget_slider_add(evas, 1, 0, _("%1.2f times"), 0.25, 8.0, 0.05, 0, &(cfdata->min), NULL, 150);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Maximum")); ob = e_widget_label_add(evas, _("Maximum"));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.1f times"), 0.25, 8.0, 0.05, 0, &(cfdata->max), NULL, 150); ob = e_widget_slider_add(evas, 1, 0, _("%1.2f times"), 0.25, 8.0, 0.05, 0, &(cfdata->max), NULL, 150);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
@ -185,7 +185,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Personal scaling factor")); ob = e_widget_label_add(evas, _("Personal scaling factor"));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.1f times"), 0.25, 8.0, 0.05, 0, &(cfdata->factor), NULL, 150); ob = e_widget_slider_add(evas, 1, 0, _("%1.2f times"), 0.25, 8.0, 0.05, 0, &(cfdata->factor), NULL, 150);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);

View File

@ -428,7 +428,7 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
_e_fwin_window_title_set(fwin); _e_fwin_window_title_set(fwin);
e_win_size_min_set(fwin->win, 24, 24); e_win_size_min_set(fwin->win, 24, 24);
e_win_resize(fwin->win, 280, 200); e_win_resize(fwin->win, 280 * e_scale, 200 * e_scale);
e_win_show(fwin->win); e_win_show(fwin->win);
if (fwin->win->evas_win) if (fwin->win->evas_win)
e_drop_xdnd_register_set(fwin->win->evas_win, 1); e_drop_xdnd_register_set(fwin->win->evas_win, 1);
@ -1213,8 +1213,8 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always)
nw = cf->geom.w; nw = cf->geom.w;
nh = cf->geom.h; nh = cf->geom.h;
/* if it ended up too small - fix to a decent size */ /* if it ended up too small - fix to a decent size */
if (nw < 24) nw = 200; if (nw < 24) nw = 200 * e_scale;
if (nh < 24) nh = 280; if (nh < 24) nh = 280 * e_scale;
printf("load @ %i %i, %ix%i inset %i %i\n", printf("load @ %i %i, %ix%i inset %i %i\n",
nx, ny, nw, nh, nx, ny, nw, nh,
fwin2->win->border->client_inset.l, fwin2->win->border->client_inset.l,
@ -1659,14 +1659,14 @@ _e_fwin_config_set(E_Fwin *fwin)
{ {
#if 0 #if 0
fmc.view.mode = E_FM2_VIEW_MODE_LIST; fmc.view.mode = E_FM2_VIEW_MODE_LIST;
fmc.icon.list.w = 24; fmc.icon.list.w = 24 * e_scale;
fmc.icon.list.h = 24; fmc.icon.list.h = 24 * e_scale;
fmc.icon.fixed.w = 1; fmc.icon.fixed.w = 1;
fmc.icon.fixed.h = 1; fmc.icon.fixed.h = 1;
#else #else
fmc.view.mode = fileman_config->view.mode; fmc.view.mode = fileman_config->view.mode;
fmc.icon.icon.w = fileman_config->icon.icon.w; fmc.icon.icon.w = fileman_config->icon.icon.w * e_scale;
fmc.icon.icon.h = fileman_config->icon.icon.h; fmc.icon.icon.h = fileman_config->icon.icon.h * e_scale;
fmc.icon.fixed.w = 0; fmc.icon.fixed.w = 0;
fmc.icon.fixed.h = 0; fmc.icon.fixed.h = 0;
#endif #endif
@ -1676,14 +1676,14 @@ _e_fwin_config_set(E_Fwin *fwin)
{ {
#if 0 #if 0
fmc.view.mode = E_FM2_VIEW_MODE_LIST; fmc.view.mode = E_FM2_VIEW_MODE_LIST;
fmc.icon.list.w = 24; fmc.icon.list.w = 24 * e_scale;
fmc.icon.list.h = 24; fmc.icon.list.h = 24 * e_scale;
fmc.icon.fixed.w = 1; fmc.icon.fixed.w = 1;
fmc.icon.fixed.h = 1; fmc.icon.fixed.h = 1;
#else #else
fmc.view.mode = E_FM2_VIEW_MODE_CUSTOM_ICONS; fmc.view.mode = E_FM2_VIEW_MODE_CUSTOM_ICONS;
fmc.icon.icon.w = fileman_config->icon.icon.w; fmc.icon.icon.w = fileman_config->icon.icon.w * e_scale;
fmc.icon.icon.h = fileman_config->icon.icon.h; fmc.icon.icon.h = fileman_config->icon.icon.h * e_scale;
fmc.icon.fixed.w = 0; fmc.icon.fixed.w = 0;
fmc.icon.fixed.h = 0; fmc.icon.fixed.h = 0;
#endif #endif