discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=1e615c9917a3be904771fdd5851d8cededabc352

commit 1e615c9917a3be904771fdd5851d8cededabc352
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Dec 10 11:54:50 2015 -0500

    do not apply x11 randr iface in wl-x11 if running nested in x11
    
    http://i.imgur.com/S7G0O96.gif
---
 src/modules/wl_x11/e_mod_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index e47fe21..1d8d940 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -83,8 +83,8 @@ e_modapi_init(E_Module *m)
    ecore_evas_name_class_set(e_comp->ee, "E", "compositor");
 
    ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h);
-
-   e_comp_x_randr_screen_iface_set();
+   if (!ecore_x_screen_is_composited(0))
+     e_comp_x_randr_screen_iface_set();
    if (!e_comp_wl_init()) return NULL;
    if (!e_comp_canvas_init(w, h)) return NULL;
 

-- 


Reply via email to