From 26e2533d94120ec00337f0dd21648644028c5bf5 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 15 Dec 2017 11:04:20 -0500 Subject: [PATCH] wl-drm: get screen geometry after e_comp_wl_init is called This change is needed because if we call ecore_evas_screen_geometry_get before calling e_comp_wl_init, then when the drm2 randr settings are applied, the screen geometry could change (saved resolutions are restored). This commit ensures that drm2 has the same resolution settings as the randr ones, and screen_geometry_get will return the proper values now. @fix Signed-off-by: Chris Michael --- src/modules/wl_drm/e_mod_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index 997cb4fa2..f9c3d2c30 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -799,12 +799,12 @@ e_modapi_init(E_Module *m) ecore_evas_data_set(e_comp->ee, "comp", e_comp); - /* get the current screen geometry */ - ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h); - e_comp->screen = &drmiface; if (!e_comp_wl_init()) return NULL; + + /* get the current screen geometry */ + ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h); if (!e_comp_canvas_init(w, h)) return NULL; ecore_evas_pointer_xy_get(e_comp->ee, &e_comp_wl->ptr.x,