fix elm_module env var and ... elm_finger size . tnx mj lee. :)
SVN revision: 54674
This commit is contained in:
parent
1360f85163
commit
0d689fc143
|
@ -1084,8 +1084,10 @@ _elm_config_sub_init(void)
|
||||||
{
|
{
|
||||||
_elm_config->scale = (double)val / 1000.0;
|
_elm_config->scale = (double)val / 1000.0;
|
||||||
// FIXME: hack until e export finger size too
|
// FIXME: hack until e export finger size too
|
||||||
if (getenv("ELM_FINGER_SIZE"))
|
if (!getenv("ELM_FINGER_SIZE"))
|
||||||
|
{
|
||||||
_elm_config->finger_size = 40.0 * _elm_config->scale;
|
_elm_config->finger_size = 40.0 * _elm_config->scale;
|
||||||
|
}
|
||||||
edje_scale_set(_elm_config->scale);
|
edje_scale_set(_elm_config->scale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -563,6 +563,7 @@ elm_quicklaunch_sub_init(int argc, char **argv)
|
||||||
ecore_app_args_set(argc, (const char **)argv);
|
ecore_app_args_set(argc, (const char **)argv);
|
||||||
evas_init();
|
evas_init();
|
||||||
edje_init();
|
edje_init();
|
||||||
|
_elm_module_init();
|
||||||
_elm_config_sub_init();
|
_elm_config_sub_init();
|
||||||
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
|
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
|
||||||
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
|
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
|
||||||
|
@ -577,7 +578,6 @@ elm_quicklaunch_sub_init(int argc, char **argv)
|
||||||
}
|
}
|
||||||
ecore_evas_init(); // FIXME: check errors
|
ecore_evas_init(); // FIXME: check errors
|
||||||
ecore_imf_init();
|
ecore_imf_init();
|
||||||
_elm_module_init();
|
|
||||||
}
|
}
|
||||||
return _elm_sub_init_count;
|
return _elm_sub_init_count;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue