forked from enlightenment/enlightenment
shelf: fixed size of style selector, better fitting var name
SVN revision: 39386
This commit is contained in:
parent
640e4c6d55
commit
71458465fb
|
@ -624,14 +624,14 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
||||||
sel = n;
|
sel = n;
|
||||||
}
|
}
|
||||||
e_widget_min_size_get(oi, &wmw, &wmh);
|
e_widget_min_size_get(oi, &wmw, &wmh);
|
||||||
e_widget_min_size_set(oi, wmw, 120);
|
e_widget_min_size_set(oi, wmw, 160);
|
||||||
|
|
||||||
e_widget_ilist_go(oi);
|
e_widget_ilist_go(oi);
|
||||||
e_widget_ilist_selected_set(oi, sel);
|
e_widget_ilist_selected_set(oi, sel);
|
||||||
|
|
||||||
e_widget_framelist_object_append(of, oi);
|
e_widget_framelist_object_append(of, oi);
|
||||||
|
|
||||||
e_widget_list_object_append(o2, of, 0, 0, 0.5);
|
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
||||||
|
|
||||||
ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
|
ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
|
||||||
e_widget_list_object_append(o2, ob, 0, 0, 0.5);
|
e_widget_list_object_append(o2, ob, 0, 0, 0.5);
|
||||||
|
|
|
@ -1396,9 +1396,10 @@ static int
|
||||||
_e_shelf_cb_hide_animator(void *data)
|
_e_shelf_cb_hide_animator(void *data)
|
||||||
{
|
{
|
||||||
E_Shelf *es;
|
E_Shelf *es;
|
||||||
int step, hidden_size;
|
int step, hide_max;
|
||||||
|
|
||||||
es = data;
|
es = data;
|
||||||
|
|
||||||
switch (es->gadcon->orient)
|
switch (es->gadcon->orient)
|
||||||
{
|
{
|
||||||
case E_GADCON_ORIENT_TOP:
|
case E_GADCON_ORIENT_TOP:
|
||||||
|
@ -1407,7 +1408,7 @@ _e_shelf_cb_hide_animator(void *data)
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
case E_GADCON_ORIENT_CORNER_BL:
|
case E_GADCON_ORIENT_CORNER_BL:
|
||||||
case E_GADCON_ORIENT_CORNER_BR:
|
case E_GADCON_ORIENT_CORNER_BR:
|
||||||
hidden_size = es->h - es->hidden_state_size;
|
hide_max = es->h - es->hidden_state_size;
|
||||||
if (es->hide_origin == -1)
|
if (es->hide_origin == -1)
|
||||||
es->hide_origin = es->y;
|
es->hide_origin = es->y;
|
||||||
break;
|
break;
|
||||||
|
@ -1417,23 +1418,22 @@ _e_shelf_cb_hide_animator(void *data)
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
case E_GADCON_ORIENT_CORNER_RB:
|
case E_GADCON_ORIENT_CORNER_RB:
|
||||||
case E_GADCON_ORIENT_CORNER_RT:
|
case E_GADCON_ORIENT_CORNER_RT:
|
||||||
hidden_size = es->w - es->hidden_state_size;
|
hide_max = es->w - es->hidden_state_size;
|
||||||
if (es->hide_origin == -1)
|
if (es->hide_origin == -1)
|
||||||
es->hide_origin = es->x;
|
es->hide_origin = es->x;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
step = (hidden_size / e_config->framerate) / es->cfg->hide_duration;
|
step = (hide_max / e_config->framerate) / es->cfg->hide_duration;
|
||||||
|
|
||||||
if (!step) step = 1;
|
if (!step) step = 1;
|
||||||
|
|
||||||
if (es->hidden)
|
if (es->hidden)
|
||||||
{
|
{
|
||||||
if (es->hide_step < hidden_size)
|
if (es->hide_step < hide_max)
|
||||||
{
|
{
|
||||||
if (es->hide_step + step > hidden_size)
|
if (es->hide_step + step > hide_max)
|
||||||
{
|
{
|
||||||
es->hide_step = hidden_size;
|
es->hide_step = hide_max;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue