From: <enl...@li...> - 2006-01-31 11:20:59
|
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src Modified Files: config.c Log Message: use nice methods in ecore_config for colour conversion =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/config.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- config.c 18 Jan 2006 12:38:01 -0000 1.55 +++ config.c 31 Jan 2006 11:20:39 -0000 1.56 @@ -53,27 +53,13 @@ return 1; } -unsigned -od_argb_get(const char *key) -{ - unsigned tmp; - int a, r, g, b; - - ecore_config_argb_get(key, &a, &r, &g, &b); - tmp=((a << 24) & 0xff000000 ) - | ((r << 16) & 0xff0000 ) - | ((g << 8) & 0xff00 ) - | ( b & 0xff ); - return tmp; -} - int colour_listener(const char *key, const Ecore_Config_Type type, const int tag, void *data) { - unsigned colour; + long colour; - colour = od_argb_get(key); + colour = ecore_config_argbint_get(key); switch (tag) { case BG_FORE: @@ -180,12 +166,10 @@ options.dock_zoom_duration = ecore_config_float_get("engage.options.zoom_duration"); - options.bg_fore = - od_argb_get("engage.options.bg_fore"); + options.bg_fore = ecore_config_argbint_get("engage.options.bg_fore"); ecore_config_listen("colour", "engage.options.bg_fore", colour_listener, BG_FORE, NULL); - options.bg_back = - od_argb_get("engage.options.bg_back"); + options.bg_back = ecore_config_argbint_get("engage.options.bg_back"); ecore_config_listen("colour", "engage.options.bg_back", colour_listener, BG_BACK, NULL); |