forked from enlightenment/enlightenment
parent
9bf77b26ac
commit
9af24491cf
|
@ -25,7 +25,7 @@ static Eina_Bool _e_shelf_cb_instant_hide_timer(void *data);
|
|||
static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_shelf_gadcon_client_remove(void *data, E_Gadcon_Client *gcc);
|
||||
static int _e_shelf_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc);
|
||||
static const char * _e_shelf_orient_icon_name_get(E_Shelf *s);
|
||||
static const char *_e_shelf_orient_icon_name_get(E_Shelf *s);
|
||||
static void _e_shelf_bindings_add(E_Shelf *es);
|
||||
static void _e_shelf_bindings_del(E_Shelf *es);
|
||||
static Eina_Bool _e_shelf_on_current_desk(E_Shelf *es, E_Event_Zone_Edge *ev);
|
||||
|
@ -240,7 +240,7 @@ e_shelf_zone_move_resize_handle(E_Zone *zone)
|
|||
{
|
||||
if (es->zone == zone)
|
||||
{
|
||||
E_Gadcon * gc;
|
||||
E_Gadcon *gc;
|
||||
|
||||
gc = es->gadcon;
|
||||
if (gc->min_size_request.func)
|
||||
|
@ -248,7 +248,7 @@ e_shelf_zone_move_resize_handle(E_Zone *zone)
|
|||
/* let gadcon container decrease to any size */
|
||||
edje_extern_object_min_size_set(gc->o_container, 0, 0);
|
||||
}
|
||||
evas_object_smart_callback_call (gc->o_container, "min_size_request", NULL);
|
||||
evas_object_smart_callback_call(gc->o_container, "min_size_request", NULL);
|
||||
e_shelf_position_calc(es);
|
||||
if (gc->min_size_request.func)
|
||||
{
|
||||
|
@ -526,48 +526,63 @@ e_shelf_orient_string_get(E_Shelf *es)
|
|||
case E_GADCON_ORIENT_FLOAT:
|
||||
sig = "float";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_HORIZ:
|
||||
sig = "horizontal";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
sig = "vertical";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
sig = "left";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
sig = "right";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
sig = "top";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
sig = "bottom";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
sig = "top_left";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
sig = "top_right";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
sig = "bottom_left";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
sig = "bottom_right";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
sig = "left_top";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
sig = "right_top";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
sig = "left_bottom";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
sig = "right_bottom";
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -593,88 +608,103 @@ e_shelf_position_calc(E_Shelf *es)
|
|||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_HORIZ:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = (es->zone->w - es->w) / 2;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->y = (es->zone->h - es->h) / 2;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->x = 0;
|
||||
es->y = (es->zone->h - es->h) / 2;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->x = es->zone->w - es->w;
|
||||
es->y = (es->zone->h - es->h) / 2;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = (es->zone->w - es->w) / 2;
|
||||
es->y = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = (es->zone->w - es->w) / 2;
|
||||
es->y = es->zone->h - es->h;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = 0;
|
||||
es->y = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = es->zone->w - es->w;
|
||||
es->y = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = 0;
|
||||
es->y = es->zone->h - es->h;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
if (!es->fit_along) es->w = es->zone->w;
|
||||
if (!es->fit_size) es->h = size;
|
||||
es->x = es->zone->w - es->w;
|
||||
es->y = es->zone->h - es->h;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->x = 0;
|
||||
es->y = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->x = es->zone->w - es->w;
|
||||
es->y = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->x = 0;
|
||||
es->y = es->zone->h - es->h;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
if (!es->fit_along) es->h = es->zone->h;
|
||||
if (!es->fit_size) es->w = size;
|
||||
es->x = es->zone->w - es->w;
|
||||
es->y = es->zone->h - es->h;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -904,6 +934,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (!es->fit_along) w = ww;
|
||||
if (!es->fit_size) h = hh;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -914,6 +945,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (!es->fit_along) h = hh;
|
||||
if (!es->fit_size) w = ww;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -930,6 +962,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh > es->zone->h) nh = es->zone->h;
|
||||
if (nw != es->w) nx = es->x + ((es->w - nw) / 2);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_HORIZ:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -937,6 +970,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh > es->zone->h) nh = es->zone->h;
|
||||
if (nw != es->w) nx = es->x + ((es->w - nw) / 2);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -944,6 +978,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh > es->zone->h) nh = es->zone->h;
|
||||
if (nh != es->h) ny = es->y + ((es->h - nh) / 2);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -952,6 +987,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh != es->h) ny = (es->zone->h - nh) / 2;
|
||||
// nx = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -960,6 +996,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh != es->h) ny = (es->zone->h - nh) / 2;
|
||||
// nx = es->zone->w - nw;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -968,6 +1005,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nw != es->w) nx = (es->zone->w - nw) / 2;
|
||||
// ny = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -976,6 +1014,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nw != es->w) nx = (es->zone->w - nw) / 2;
|
||||
//ny = es->zone->h - nh;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -984,6 +1023,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nw != es->w) nx = 0;
|
||||
// ny = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -992,6 +1032,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
nx = es->zone->w - nw;
|
||||
// ny = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -1000,6 +1041,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nw != es->w) nx = 0;
|
||||
// ny = es->zone->h - nh;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
if (!es->fit_along) nw = es->w;
|
||||
if (!es->fit_size) nh = es->h;
|
||||
|
@ -1008,6 +1050,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
nx = es->zone->w - nw;
|
||||
//ny = es->zone->h - nh;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -1016,6 +1059,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh != es->h) ny = 0;
|
||||
// nx = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -1024,6 +1068,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh != es->h) ny = 0;
|
||||
// nx = es->zone->w - nw;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -1032,6 +1077,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh != es->h) ny = es->zone->h - nh;
|
||||
// nx = 0;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
if (!es->fit_along) nh = es->h;
|
||||
if (!es->fit_size) nw = es->w;
|
||||
|
@ -1040,6 +1086,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
|
|||
if (nh != es->h) ny = es->zone->h - nh;
|
||||
// nx = es->zone->w - nw;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -1123,24 +1170,28 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
|
|||
if (!es->hidden)
|
||||
e_border_move(bd, bd->x, bd->y + es->h);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
if (!es->hidden)
|
||||
e_border_move(bd, bd->x, bd->y - es->h);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
if (!es->hidden)
|
||||
e_border_move(bd, bd->x + es->w, bd->y);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
if (!es->hidden)
|
||||
e_border_move(bd, bd->x - es->w, bd->y);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -1173,7 +1224,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
|
|||
const char *name;
|
||||
char buf[256];
|
||||
|
||||
name = e_shelf_orient_string_get (es);
|
||||
name = e_shelf_orient_string_get(es);
|
||||
snprintf(buf, sizeof(buf), "Shelf %s", name);
|
||||
|
||||
e_shelf_locked_set(es, 1);
|
||||
|
@ -1278,7 +1329,6 @@ _e_shelf_cb_confirm_dialog_yes(void *data)
|
|||
e_config_save_queue();
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_e_shelf_cb_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
|
@ -1335,6 +1385,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNU
|
|||
case 1:
|
||||
if (es->cfg->autohide_show_action) e_shelf_toggle(es, 1);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
mn = e_menu_new();
|
||||
e_menu_post_deactivate_callback_set(mn, _e_shelf_cb_menu_post, es);
|
||||
|
@ -1376,6 +1427,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
|
|||
case E_GADCON_ORIENT_VERT:
|
||||
/* noop */
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
|
@ -1385,6 +1437,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
|
|||
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
|
||||
show = 1;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
|
@ -1394,6 +1447,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
|
|||
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
|
||||
show = 1;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
|
@ -1403,6 +1457,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
|
|||
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
|
||||
show = 1;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
|
@ -1491,7 +1546,8 @@ _e_shelf_cb_id_sort(const void *data1, const void *data2)
|
|||
es1 = data1;
|
||||
es2 = data2;
|
||||
if ((es1->id) < (es2->id)) return -1;
|
||||
else if (es1->id > es2->id) return 1;
|
||||
else if (es1->id > es2->id)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1513,6 +1569,7 @@ _e_shelf_cb_hide_animator(void *data)
|
|||
hide_max = es->h - es->hidden_state_size;
|
||||
if (es->hide_origin == -1) es->hide_origin = es->y;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
|
@ -1522,6 +1579,7 @@ _e_shelf_cb_hide_animator(void *data)
|
|||
hide_max = es->w - es->hidden_state_size;
|
||||
if (es->hide_origin == -1) es->hide_origin = es->x;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_FLOAT:
|
||||
case E_GADCON_ORIENT_HORIZ:
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
|
@ -1561,21 +1619,25 @@ _e_shelf_cb_hide_animator(void *data)
|
|||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
e_shelf_move(es, es->x, es->hide_origin - es->hide_step);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
e_shelf_move(es, es->x, es->hide_origin + es->hide_step);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
e_shelf_move(es, es->hide_origin - es->hide_step, es->y);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
e_shelf_move(es, es->hide_origin + es->hide_step, es->y);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_FLOAT:
|
||||
case E_GADCON_ORIENT_HORIZ:
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
|
@ -1634,6 +1696,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
|
|||
else
|
||||
e_shelf_move(es, es->x, es->y + es->h - es->hidden_state_size);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
|
@ -1642,6 +1705,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
|
|||
else
|
||||
e_shelf_move(es, es->x, es->y - es->h + es->hidden_state_size);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
|
@ -1650,6 +1714,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
|
|||
else
|
||||
e_shelf_move(es, es->x + es->w - es->hidden_state_size, es->y);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
|
@ -1658,6 +1723,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
|
|||
else
|
||||
e_shelf_move(es, es->x - es->w + es->hidden_state_size, es->y);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -1735,9 +1801,9 @@ _e_shelf_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc)
|
|||
}
|
||||
|
||||
static const char *
|
||||
_e_shelf_orient_icon_name_get(E_Shelf * s)
|
||||
_e_shelf_orient_icon_name_get(E_Shelf *s)
|
||||
{
|
||||
const char * name;
|
||||
const char *name;
|
||||
|
||||
name = NULL;
|
||||
switch (s->cfg->orient)
|
||||
|
@ -1745,39 +1811,51 @@ _e_shelf_orient_icon_name_get(E_Shelf * s)
|
|||
case E_GADCON_ORIENT_LEFT:
|
||||
name = "preferences-position-left";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
name = "preferences-position-right";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
name = "preferences-position-top";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
name = "preferences-position-bottom";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
name = "preferences-position-top-left";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
name = "preferences-position-top-right";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
name = "preferences-position-bottom-left";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
name = "preferences-position-bottom-right";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
name = "preferences-position-left-top";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
name = "preferences-position-right-top";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
name = "preferences-position-left-bottom";
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
name = "preferences-position-right-bottom";
|
||||
break;
|
||||
|
||||
default:
|
||||
name = "preferences-desktop-shelf";
|
||||
break;
|
||||
|
@ -1804,36 +1882,44 @@ _e_shelf_bindings_add(E_Shelf *es)
|
|||
case E_GADCON_ORIENT_VERT:
|
||||
/* noop */
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_LEFT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_RIGHT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_TOP, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_BOTTOM:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_BOTTOM, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
case E_GADCON_ORIENT_CORNER_LT:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_TOP, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_LEFT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_TOP_LEFT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
case E_GADCON_ORIENT_CORNER_RT:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_TOP, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_RIGHT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_TOP_RIGHT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BL:
|
||||
case E_GADCON_ORIENT_CORNER_LB:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_BOTTOM, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_LEFT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_BOTTOM_LEFT, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, E_ZONE_EDGE_BOTTOM, E_BINDING_MODIFIER_NONE, 1, buf, NULL, 0);
|
||||
|
@ -1875,6 +1961,6 @@ _e_shelf_on_current_desk(E_Shelf *es, E_Event_Zone_Edge *ev)
|
|||
if (!on_all_desks && !on_current_desk)
|
||||
return EINA_FALSE;
|
||||
|
||||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue