e_comp: move position of the E_LAYER_CLIENT_DRAG to right below of the cursor

Change-Id: I2df2e7bea5d81e47c0752172ed9c4f92b92420a4

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 78fc7e3..119ad78 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -741,7 +741,6 @@ e_comp_layer_name_get(unsigned int layer, char *buff, int buff_size)
       case E_LAYER_CLIENT_EDGE_FULLSCREEN: strncpy(buff, "E_LAYER_CLIENT_EDGE_FULLSCREEN", buff_size); break;
       case E_LAYER_CLIENT_POPUP: strncpy(buff, "E_LAYER_CLIENT_POPUP", buff_size); break;
       case E_LAYER_CLIENT_TOP: strncpy(buff, "E_LAYER_CLIENT_TOP", buff_size); break;
-      case E_LAYER_CLIENT_DRAG: strncpy(buff, "E_LAYER_CLIENT_DRAG", buff_size); break;
       case E_LAYER_CLIENT_PRIO: strncpy(buff, "E_LAYER_CLIENT_PRIO", buff_size); break;
       case E_LAYER_CLIENT_NOTIFICATION_LOW: strncpy(buff, "E_LAYER_CLIENT_NOTIFICATION_LOW", buff_size); break;
       case E_LAYER_CLIENT_NOTIFICATION_NORMAL: strncpy(buff, "E_LAYER_CLIENT_NOTIFICATION_NORMAL", buff_size); break;
@@ -750,6 +749,7 @@ e_comp_layer_name_get(unsigned int layer, char *buff, int buff_size)
       case E_LAYER_CLIENT_ALERT_LOW: strncpy(buff, "E_LAYER_CLIENT_ALERT_LOW", buff_size); break;
       case E_LAYER_CLIENT_ALERT: strncpy(buff, "E_LAYER_CLIENT_ALERT", buff_size); break;
       case E_LAYER_CLIENT_ALERT_HIGH: strncpy(buff, "E_LAYER_CLIENT_ALERT_HIGH", buff_size); break;
+      case E_LAYER_CLIENT_DRAG: strncpy(buff, "E_LAYER_CLIENT_DRAG", buff_size); break;
       case E_LAYER_CLIENT_CURSOR: strncpy(buff, "E_LAYER_CLIENT_CURSOR", buff_size); break;
       case E_LAYER_POPUP: strncpy(buff, "E_LAYER_POPUP", buff_size); break;
       case E_LAYER_EFFECT: strncpy(buff, "E_LAYER_EFFECT", buff_size); break;

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index e3a7cc3..dc0097f 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -27,7 +27,6 @@ typedef enum _E_Layer
    E_LAYER_CLIENT_EDGE_FULLSCREEN = 400,
    E_LAYER_CLIENT_POPUP = 450,
    E_LAYER_CLIENT_TOP = 500,
-   E_LAYER_CLIENT_DRAG = 550,
    E_LAYER_CLIENT_PRIO = 600,
    E_LAYER_CLIENT_NOTIFICATION_LOW = 650,
    E_LAYER_CLIENT_NOTIFICATION_NORMAL = 700,
@@ -36,6 +35,7 @@ typedef enum _E_Layer
    E_LAYER_CLIENT_ALERT_LOW = 850,
    E_LAYER_CLIENT_ALERT = 900,
    E_LAYER_CLIENT_ALERT_HIGH = 950,
+   E_LAYER_CLIENT_DRAG = 980,
    E_LAYER_CLIENT_CURSOR = 990,
    E_LAYER_POPUP = 999, // popups
    E_LAYER_EFFECT = 1999,

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 148d688..a1bb54e 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -507,15 +507,15 @@ e_comp_canvas_layer_map_to(unsigned int layer)
       case 10: return E_LAYER_CLIENT_EDGE_FULLSCREEN;
       case 11: return E_LAYER_CLIENT_POPUP;
       case 12: return E_LAYER_CLIENT_TOP;
-      case 13: return E_LAYER_CLIENT_DRAG;
-      case 14: return E_LAYER_CLIENT_PRIO;
-      case 15: return E_LAYER_CLIENT_NOTIFICATION_LOW;
-      case 16: return E_LAYER_CLIENT_NOTIFICATION_NORMAL;
-      case 17: return E_LAYER_CLIENT_NOTIFICATION_HIGH;
-      case 18: return E_LAYER_CLIENT_NOTIFICATION_TOP;
-      case 19: return E_LAYER_CLIENT_ALERT_LOW;
-      case 20: return E_LAYER_CLIENT_ALERT;
-      case 21: return E_LAYER_CLIENT_ALERT_HIGH;
+      case 13: return E_LAYER_CLIENT_PRIO;
+      case 14: return E_LAYER_CLIENT_NOTIFICATION_LOW;
+      case 15: return E_LAYER_CLIENT_NOTIFICATION_NORMAL;
+      case 16: return E_LAYER_CLIENT_NOTIFICATION_HIGH;
+      case 17: return E_LAYER_CLIENT_NOTIFICATION_TOP;
+      case 18: return E_LAYER_CLIENT_ALERT_LOW;
+      case 19: return E_LAYER_CLIENT_ALERT;
+      case 20: return E_LAYER_CLIENT_ALERT_HIGH;
+      case 21: return E_LAYER_CLIENT_DRAG;
       case 22: return E_LAYER_CLIENT_CURSOR;
       case 23: return E_LAYER_POPUP;
       case 24: return E_LAYER_EFFECT;
@@ -548,15 +548,15 @@ e_comp_canvas_layer_map(E_Layer layer)
       case E_LAYER_CLIENT_EDGE_FULLSCREEN: return 10;
       case E_LAYER_CLIENT_POPUP: return 11;
       case E_LAYER_CLIENT_TOP: return 12;
-      case E_LAYER_CLIENT_DRAG: return 13;
-      case E_LAYER_CLIENT_PRIO: return 14;
-      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 15;
-      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 16;
-      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 17;
-      case E_LAYER_CLIENT_NOTIFICATION_TOP: return 18;
-      case E_LAYER_CLIENT_ALERT_LOW: return 19;
-      case E_LAYER_CLIENT_ALERT: return 20;
-      case E_LAYER_CLIENT_ALERT_HIGH: return 21;
+      case E_LAYER_CLIENT_PRIO: return 13;
+      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 14;
+      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 15;
+      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 16;
+      case E_LAYER_CLIENT_NOTIFICATION_TOP: return 17;
+      case E_LAYER_CLIENT_ALERT_LOW: return 18;
+      case E_LAYER_CLIENT_ALERT: return 19;
+      case E_LAYER_CLIENT_ALERT_HIGH: return 20;
+      case E_LAYER_CLIENT_DRAG: return 21;
       case E_LAYER_CLIENT_CURSOR: return 22;
       case E_LAYER_POPUP: return 23;
       case E_LAYER_EFFECT: return 24;
@@ -588,15 +588,15 @@ e_comp_canvas_client_layer_map(E_Layer layer)
       case E_LAYER_CLIENT_EDGE_FULLSCREEN: return 6;
       case E_LAYER_CLIENT_POPUP: return 7;
       case E_LAYER_CLIENT_TOP: return 8;
-      case E_LAYER_CLIENT_DRAG: return 9;
-      case E_LAYER_CLIENT_PRIO: return 10;
-      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 11;
-      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 12;
-      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 13;
-      case E_LAYER_CLIENT_NOTIFICATION_TOP: return 14;
-      case E_LAYER_CLIENT_ALERT_LOW: return 15;
-      case E_LAYER_CLIENT_ALERT: return 16;
-      case E_LAYER_CLIENT_ALERT_HIGH: return 17;
+      case E_LAYER_CLIENT_PRIO: return 9;
+      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 10;
+      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 11;
+      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 12;
+      case E_LAYER_CLIENT_NOTIFICATION_TOP: return 13;
+      case E_LAYER_CLIENT_ALERT_LOW: return 14;
+      case E_LAYER_CLIENT_ALERT: return 15;
+      case E_LAYER_CLIENT_ALERT_HIGH: return 16;
+      case E_LAYER_CLIENT_DRAG: return 17;
       case E_LAYER_CLIENT_CURSOR: return 18;
       default: break;
      }
@@ -618,7 +618,6 @@ e_comp_canvas_client_layer_map_nearest(int layer)
    LAYER_MAP(E_LAYER_CLIENT_EDGE_FULLSCREEN);
    LAYER_MAP(E_LAYER_CLIENT_POPUP);
    LAYER_MAP(E_LAYER_CLIENT_TOP);
-   LAYER_MAP(E_LAYER_CLIENT_DRAG);
    LAYER_MAP(E_LAYER_CLIENT_PRIO);
    LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_LOW);
    LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_NORMAL);
@@ -627,6 +626,7 @@ e_comp_canvas_client_layer_map_nearest(int layer)
    LAYER_MAP(E_LAYER_CLIENT_ALERT_LOW);
    LAYER_MAP(E_LAYER_CLIENT_ALERT);
    LAYER_MAP(E_LAYER_CLIENT_ALERT_HIGH);
+   LAYER_MAP(E_LAYER_CLIENT_DRAG);
    return E_LAYER_CLIENT_CURSOR;
 }
 

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 1d8a226..d428e15 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -1878,7 +1878,6 @@ _e_comp_layer_idx_get(const char *layer_name)
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_EDGE_FULLSCREEN))     return E_LAYER_CLIENT_EDGE_FULLSCREEN;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_POPUP))               return E_LAYER_CLIENT_POPUP;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_TOP))                 return E_LAYER_CLIENT_TOP;
-   if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_DRAG))                return E_LAYER_CLIENT_DRAG;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_PRIO))                return E_LAYER_CLIENT_PRIO;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_NOTIFICATION_LOW))    return E_LAYER_CLIENT_NOTIFICATION_LOW;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_NOTIFICATION_NORMAL)) return E_LAYER_CLIENT_NOTIFICATION_NORMAL;
@@ -1887,6 +1886,7 @@ _e_comp_layer_idx_get(const char *layer_name)
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_ALERT_LOW))           return E_LAYER_CLIENT_ALERT_LOW;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_ALERT))               return E_LAYER_CLIENT_ALERT;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_ALERT_HIGH))          return E_LAYER_CLIENT_ALERT_HIGH;
+   if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_DRAG))                return E_LAYER_CLIENT_DRAG;
    if (!_check_layer_idx(layer_name, E_LAYER_CLIENT_CURSOR))              return E_LAYER_CLIENT_CURSOR;
    if (!_check_layer_idx(layer_name, E_LAYER_POPUP))                      return E_LAYER_POPUP;
    if (!_check_layer_idx(layer_name, E_LAYER_EFFECT))                     return E_LAYER_EFFECT;