summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-03-01 11:43:11 -0500
committerChris Michael <cp.michael@samsung.com>2017-03-01 11:43:11 -0500
commit81783ec75caf4e4314abd8baf362718379b86570 (patch)
tree3c62d61980e3ace29ba1e8dbad19170deb43d3c7
parentdfb18775002c5130b60bdc03ed60b7de356e6012 (diff)
ecore-evas-wayland: Remove duplicated code
As we already call the same functions inside _ecore_evas_wl_common_show, there is no need to duplicate the same code when we have defer_show set...just call the show function. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c40
1 files changed, 1 insertions, 39 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index e336c46305..75626a24ef 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -2020,46 +2020,8 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
2020 2020
2021 if (wdata->defer_show) 2021 if (wdata->defer_show)
2022 { 2022 {
2023 int fw, fh;
2024
2025 wdata->defer_show = EINA_FALSE; 2023 wdata->defer_show = EINA_FALSE;
2026 2024 _ecore_evas_wl_common_show(ee);
2027 _ecore_evas_register(ee);
2028
2029 ecore_wl2_window_show(wdata->win);
2030 ecore_wl2_window_alpha_set(wdata->win, ee->alpha);
2031 ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
2032
2033 if (wdata->defer_fullscreen)
2034 {
2035 wdata->defer_fullscreen = EINA_FALSE;
2036 ecore_wl2_window_fullscreen_set(wdata->win, ee->prop.fullscreen);
2037 }
2038
2039 evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
2040
2041 if (wdata->win)
2042 {
2043
2044 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
2045 if (einfo)
2046 {
2047 evas_damage_rectangle_add(ee->evas, 0, 0,
2048 ee->w + fw, ee->h + fh);
2049 einfo->www_avail = !!wdata->win->www_surface;
2050 }
2051 }
2052
2053 ee->prop.withdrawn = EINA_FALSE;
2054 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
2055
2056 if (!ee->visible)
2057 {
2058 ee->visible = 1;
2059 ee->should_be_visible = 1;
2060 ee->draw_ok = EINA_TRUE;
2061 if (ee->func.fn_show) ee->func.fn_show(ee);
2062 }
2063 } 2025 }
2064 2026
2065 return ECORE_CALLBACK_PASS_ON; 2027 return ECORE_CALLBACK_PASS_ON;