Revert "rotation: modify code handling available/preferred angle (2nd version)" 20/217520/5
authorJuyeon Lee <juyeonne.lee@samsung.com>
Tue, 12 Nov 2019 07:05:06 +0000 (16:05 +0900)
committerJuyeon Lee <juyeonne.lee@samsung.com>
Tue, 19 Nov 2019 09:35:44 +0000 (18:35 +0900)
This reverts commit c2b68b47b2c2b01d1c492be2f64e9faa31073532.

revert reason:
if ec is 90(270) available app and launched, or
if ec is specific angle prefer app and launched
it always fall in fail case(rot done) when ack arrived.
for example, event flow is like below
Server <--- available [0010] 90 only
Server ---> angle change 90, with serial xx
Server <--- commit based on 0 degree
Server <--- rotation_ack, with serial xx
Server <--- commit based on 90 degree
but the serial never match becasue it is 0(unsaved)

Conflicts:
src/rotation/e_mod_rotation_wl.c

Change-Id: Icad246ea8fd49394580954017ebed39fbd629fba

src/rotation/e_mod_rotation_wl.c

index 4cf6fb4..ce40b8a 100644 (file)
@@ -445,17 +445,10 @@ _e_tizen_rotation_set_available_angles_cb(struct wl_client *client,
              EDBG(ec, "Send Change Rotation: angle %d for redering preparation of landscape only app. mapped:%d serial:%u",
                   tz_angle, ec->first_mapped, serial);
 
-             if (ec->first_mapped)
-               {
-                  rot->angle_change_done = EINA_FALSE;
-                  rot->prev_angle = rot->cur_angle;
-                  rot->cur_angle = tz_angle;
-                  rot->serial = serial;
-               }
-             else
-               {
-                  ec->e.state.rot.ang.curr = TIZEN_ROTATION_ANGLE_TO_INT(tz_angle);
-               }
+             rot->angle_change_done = EINA_FALSE;
+             rot->prev_angle = rot->cur_angle;
+             rot->cur_angle = tz_angle;
+             rot->serial = serial;
 
              EINA_LIST_FOREACH(rot->rotation_list, l, res)
                {
@@ -529,17 +522,10 @@ _e_tizen_rotation_set_preferred_angle_cb(struct wl_client *client,
           {
              serial = wl_display_next_serial(e_comp_wl->wl.disp);
 
-             if (ec->first_mapped)
-               {
-                  rot->angle_change_done = EINA_FALSE;
-                  rot->prev_angle = rot->cur_angle;
-                  rot->cur_angle = tz_angle;
-                  rot->serial = serial;
-               }
-             else
-               {
-                  ec->e.state.rot.ang.curr = TIZEN_ROTATION_ANGLE_TO_INT(tz_angle);
-               }
+             rot->angle_change_done = EINA_FALSE;
+             rot->prev_angle = rot->cur_angle;
+             rot->cur_angle = tz_angle;
+             rot->serial = serial;
 
              EINA_LIST_FOREACH(rot->rotation_list, l, res)
                {