forked from enlightenment/enlightenment
parent
4c0fa2d381
commit
ae3dfcabca
|
@ -229,12 +229,14 @@ e_toolbar_position_calc(E_Toolbar *tbar)
|
||||||
tbar->h = 32;
|
tbar->h = 32;
|
||||||
tbar->w = tbar->fwin->w;
|
tbar->w = tbar->fwin->w;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
tbar->x = 0;
|
tbar->x = 0;
|
||||||
tbar->h = 32;
|
tbar->h = 32;
|
||||||
tbar->w = tbar->fwin->w;
|
tbar->w = tbar->fwin->w;
|
||||||
tbar->y = (tbar->fwin->h - tbar->h);
|
tbar->y = (tbar->fwin->h - tbar->h);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_VERT:
|
case E_GADCON_ORIENT_VERT:
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
tbar->x = 0;
|
tbar->x = 0;
|
||||||
|
@ -242,12 +244,14 @@ e_toolbar_position_calc(E_Toolbar *tbar)
|
||||||
tbar->h = tbar->fwin->h;
|
tbar->h = tbar->fwin->h;
|
||||||
tbar->y = 0;
|
tbar->y = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
tbar->y = 0;
|
tbar->y = 0;
|
||||||
tbar->w = 32;
|
tbar->w = 32;
|
||||||
tbar->x = (tbar->fwin->w - tbar->w);
|
tbar->x = (tbar->fwin->w - tbar->w);
|
||||||
tbar->h = tbar->fwin->h;
|
tbar->h = tbar->fwin->h;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -420,11 +424,13 @@ _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coor
|
||||||
w = ww;
|
w = ww;
|
||||||
h = 32;
|
h = 32;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
w = 32;
|
w = 32;
|
||||||
h = hh;
|
h = hh;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -439,6 +445,7 @@ _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coor
|
||||||
if (nw > tbar->fwin->w) nw = tbar->fwin->w;
|
if (nw > tbar->fwin->w) nw = tbar->fwin->w;
|
||||||
if (nh > tbar->fwin->h) nh = 32;
|
if (nh > tbar->fwin->h) nh = 32;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
nx = 0;
|
nx = 0;
|
||||||
nw = tbar->w;
|
nw = tbar->w;
|
||||||
|
@ -447,6 +454,7 @@ _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coor
|
||||||
if (nh > tbar->fwin->h) nh = 32;
|
if (nh > tbar->fwin->h) nh = 32;
|
||||||
ny = (tbar->fwin->h - nh);
|
ny = (tbar->fwin->h - nh);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
nx = ny = 0;
|
nx = ny = 0;
|
||||||
nw = tbar->w;
|
nw = tbar->w;
|
||||||
|
@ -454,6 +462,7 @@ _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coor
|
||||||
if (nh > tbar->fwin->h) nh = tbar->fwin->h;
|
if (nh > tbar->fwin->h) nh = tbar->fwin->h;
|
||||||
if (nw > tbar->fwin->w) nw = 32;
|
if (nw > tbar->fwin->w) nw = 32;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
ny = 0;
|
ny = 0;
|
||||||
nh = tbar->h;
|
nh = tbar->h;
|
||||||
|
@ -462,6 +471,7 @@ _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coor
|
||||||
if (nh > tbar->fwin->h) nh = tbar->fwin->h;
|
if (nh > tbar->fwin->h) nh = tbar->fwin->h;
|
||||||
nx = (tbar->fwin->w - tbar->w);
|
nx = (tbar->fwin->w - tbar->w);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -478,21 +488,27 @@ _e_toolbar_orient_string_get(E_Toolbar *tbar)
|
||||||
case E_GADCON_ORIENT_HORIZ:
|
case E_GADCON_ORIENT_HORIZ:
|
||||||
sig = "horizontal";
|
sig = "horizontal";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_VERT:
|
case E_GADCON_ORIENT_VERT:
|
||||||
sig = "vertical";
|
sig = "vertical";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
sig = "left";
|
sig = "left";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
sig = "right";
|
sig = "right";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_TOP:
|
case E_GADCON_ORIENT_TOP:
|
||||||
sig = "top";
|
sig = "top";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
sig = "bottom";
|
sig = "bottom";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -594,3 +610,4 @@ _e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj __UNUSED__, void *
|
||||||
evas_object_smart_callback_call(gcc->o_base, "selection_changed", tbar);
|
evas_object_smart_callback_call(gcc->o_base, "selection_changed", tbar);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue