enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

fix elm_module env var and ... elm_finger size . tnx mj lee. :) 

SVN revision: 54674
This commit is contained in:
Carsten Haitzler 2010-11-18 09:30:46 +00:00
parent 1360f85163
commit 0d689fc143
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/src/lib/elm_config.c
View File

@ -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);
} }
} }

4
legacy/elementary/src/lib/elm_main.c
View File

@ -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;
} }
@ -1473,7 +1473,7 @@ elm_finger_size_set(Evas_Coord size)
{ {
if (_elm_config->finger_size == size) return; if (_elm_config->finger_size == size) return;
_elm_config->finger_size = size; _elm_config->finger_size = size;
_elm_rescale(); _elm_rescale();
} }
/** /**