diff options
| -rw-r--r-- | elementary.pc.in | 4 | ||||
| -rw-r--r-- | src/lib/elm_main.c | 6 | ||||
| -rw-r--r-- | src/lib/elm_priv.h | 2 | ||||
| -rw-r--r-- | src/lib/elm_win.c | 7 |
4 files changed, 15 insertions, 4 deletions
diff --git a/elementary.pc.in b/elementary.pc.in index 3d2dfa4b9..0e299f025 100644 --- a/elementary.pc.in +++ b/elementary.pc.in @@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: eet -Description: Library for speedy data storage, retrieval, and compression +Name: elementary +Description: Mobile device touchscreen widget library Version: @VERSION@ Libs: -L${libdir} -lelementary Libs.private: @my_libs@ @ELEMENTARY_LIBS@ diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 46d554872..44b97e864 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -36,6 +36,8 @@ elm_init(int argc, char **argv) _elm_config->thumbscroll_momentum_threshhold = 100.0; _elm_config->thumbscroll_friction = 1.0; _elm_config->scale = 1.0; + _elm_config->bgpixmap = 1; + _elm_config->compositing = 1; if ((_elm_config->engine == ELM_SOFTWARE_X11) || (_elm_config->engine == ELM_SOFTWARE_16_X11) || @@ -51,8 +53,10 @@ elm_init(int argc, char **argv) { if (val > 0) _elm_config->scale = (double)val / 1000.0; } + if (!ecore_x_screen_is_composited(0)) + _elm_config->compositing = 0; } - + } EAPI void diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index 54dcc31a4..cc023ef2a 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -28,6 +28,8 @@ struct _Elm_Config double thumbscroll_momentum_threshhold; double thumbscroll_friction; double scale; + int bgpixmap; + int compositing; }; #define ELM_NEW(t) calloc(1, sizeof(t)) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 6761dabb8..05c471d47 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -354,6 +354,11 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) free(win); return NULL; } + printf("_elm_config->bgpixmap = %i\n" + "_elm_config->compositing = %i\n", + _elm_config->bgpixmap, _elm_config->compositing); + if (_elm_config->bgpixmap && !_elm_config->compositing) + ecore_evas_avoid_damage_set(win->ee, ECORE_EVAS_AVOID_DAMAGE_BUILT_IN); win->type = type; win->parent = parent; @@ -476,7 +481,7 @@ elm_win_alpha_set(Evas_Object *obj, Evas_Bool alpha) { if (alpha) { - if (!ecore_x_screen_is_composited(0)) + if (!_elm_config->compositing) elm_win_shaped_set(obj, alpha); else ecore_evas_alpha_set(win->ee, alpha); |