modify some code to work properly

Change-Id: I91ab54cef588b68398481564b49c2bc98f6b834b

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 4443db21257e0120ef16ca3ba8051d9a8160029c..6cafc05c76ef2120ba4f210a8b706f77b29e0a77 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -672,22 +672,10 @@ e_output_commit(E_Output *output)
    if (output->zoom_set)
      {
         /* commit only primary */
-        if (!fb_commit)
-          {
-             ERR("fb_commit is failed.");
-             return EINA_FALSE;
-          }
-
-        /* do not execute the tdm functions */
-        e_plane_activation_set(plane, EINA_FALSE);
-
-        if (!e_plane_fetch(plane))
-          {
-            ERR("fail to fetch the plane.");
-            return EINA_FALSE;
-          }
+        if (!fb_commit) return EINA_TRUE;
 
-        if (!e_plane_zoom_commit(plane))
+        /* zoom commit */
+        if (!e_plane_zoom_commit(fb_target))
           ERR("fail to e_plane_zoom_commit");
      }
    else
@@ -698,9 +686,6 @@ e_output_commit(E_Output *output)
              /* skip the fb_target fetch because we do this previously */
              if (e_plane_is_fb_target(plane)) continue;
 
-             /* execute the tdm functions */
-             e_plane_activation_set(plane, EINA_TRUE);
-
              /* if the plane is the candidate to unset,
                 set the plane to be unset_try */
              if (e_plane_is_unset_candidate(plane))

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 03d3943a00bd9eda864cdb147103d6b0a83923a7..472ac9ab45be6db53518651625df88eb3b0d184f 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -1552,19 +1552,6 @@ e_plane_show_state(E_Plane *plane)
      e_plane_renderer_show_state(plane->renderer);
 }
 
-EINTERN void
-e_plane_activation_set(E_Plane *plane, Eina_Bool set)
-{
-   EINA_SAFETY_ON_NULL_RETURN(plane);
-
-   if (plane->activation == set) return;
-
-   plane->activation = set;
-
-   ELOGF("E_PLANE", "Plane(%p) activation set to be %s",
-         NULL, NULL, plane, set?"True":"False");
-}
-
 static Eina_Bool
 _e_plane_zoom_set_pp_info(E_Plane *plane)
 {
@@ -2070,8 +2057,6 @@ e_plane_zoom_set(E_Plane *plane, Eina_Rectangle *rect)
        (plane->zoom_rect_temp.w == rect->w) && (plane->zoom_rect_temp.h == rect->h))
      return EINA_TRUE;
 
-   if (plane->zoom_unset) plane->zoom_unset = EINA_FALSE;
-
    e_comp_screen = e_comp->e_comp_screen;
    e_output_size_get(plane->output, &w, &h);
 
@@ -2100,6 +2085,9 @@ e_plane_zoom_set(E_Plane *plane, Eina_Rectangle *rect)
    plane->zoom_rect_temp.w = rect->w;
    plane->zoom_rect_temp.h = rect->h;
 
+   plane->zoom_unset = EINA_FALSE;
+   plane->activation = EINA_FALSE;
+
    return EINA_TRUE;
 
 fail:
@@ -2123,4 +2111,5 @@ e_plane_zoom_unset(E_Plane *plane)
    plane->zoom_rect.h = plane->zoom_rect_temp.h = 0;
 
    plane->zoom_unset = EINA_TRUE;
+   plane->activation = EINA_TRUE;
 }

diff --git a/src/bin/e_plane.h b/src/bin/e_plane.h
index 7abd3d07d1c082be20c4b4e405c7096835d5ba17..be9cc95749a45844b5d76069ca074125af4a002d 100644 (file)
--- a/src/bin/e_plane.h
+++ b/src/bin/e_plane.h
@@ -142,7 +142,6 @@ EINTERN Eina_Bool            e_plane_is_unset_candidate(E_Plane *plane);
 EINTERN Eina_Bool            e_plane_is_unset_try(E_Plane *plane);
 EINTERN void                 e_plane_unset_try_set(E_Plane *plane, Eina_Bool set);
 EINTERN Eina_Bool            e_plane_unset_commit_check(E_Plane *plane);
-EINTERN void                 e_plane_activation_set(E_Plane *plane, Eina_Bool set);
 EINTERN Eina_Bool            e_plane_zoom_commit(E_Plane *plane);
 EINTERN Eina_Bool            e_plane_zoom_set(E_Plane *plane, Eina_Rectangle *rect);
 EINTERN void                 e_plane_zoom_unset(E_Plane *plane);