forked from enlightenment/enlightenment
move comp fake layer init into canvas init for non-X compositors
This commit is contained in:
parent
9986311035
commit
24887ddccc
|
@ -233,6 +233,9 @@ e_comp_canvas_init(int w, int h)
|
||||||
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_cb_screensaver_on, NULL);
|
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_cb_screensaver_on, NULL);
|
||||||
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, _e_comp_cb_screensaver_off, NULL);
|
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, _e_comp_cb_screensaver_off, NULL);
|
||||||
|
|
||||||
|
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
||||||
|
e_comp_canvas_fake_layers_init();
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,6 @@ e_modapi_init(E_Module *m)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!e_comp_canvas_init(w, h)) return NULL;
|
if (!e_comp_canvas_init(w, h)) return NULL;
|
||||||
e_comp_canvas_fake_layers_init();
|
|
||||||
|
|
||||||
/* NB: This needs to be called AFTER the comp canvas has been setup */
|
/* NB: This needs to be called AFTER the comp canvas has been setup */
|
||||||
if (!e_comp_wl_init()) return NULL;
|
if (!e_comp_wl_init()) return NULL;
|
||||||
|
|
|
@ -44,7 +44,6 @@ e_modapi_init(E_Module *m)
|
||||||
}
|
}
|
||||||
e_comp_canvas_init(w, h);
|
e_comp_canvas_init(w, h);
|
||||||
e_comp_wl_init();
|
e_comp_wl_init();
|
||||||
e_comp_canvas_fake_layers_init();
|
|
||||||
comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE);
|
comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE);
|
||||||
|
|
||||||
ecore_wl_init(NULL);
|
ecore_wl_init(NULL);
|
||||||
|
|
|
@ -102,7 +102,6 @@ e_modapi_init(E_Module *m)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!e_comp_canvas_init(w, h)) return NULL;
|
if (!e_comp_canvas_init(w, h)) return NULL;
|
||||||
e_comp_canvas_fake_layers_init();
|
|
||||||
|
|
||||||
/* NB: This needs to be called AFTER comp_canvas has been setup as it
|
/* NB: This needs to be called AFTER comp_canvas has been setup as it
|
||||||
* makes reference to the comp->evas */
|
* makes reference to the comp->evas */
|
||||||
|
|
Loading…
Reference in New Issue