forked from enlightenment/enlightenment
parent
9af24491cf
commit
1a7c41f86a
|
@ -564,6 +564,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
|
|||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
horiz = 1;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -573,6 +574,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
|
|||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
horiz = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -858,6 +860,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id __UNUSED__, c
|
|||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
e_box_orientation_set(gcc->o_box, 1);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -867,6 +870,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id __UNUSED__, c
|
|||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
e_box_orientation_set(gcc->o_box, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -1105,6 +1109,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
|
|||
else if (gcc->o_base)
|
||||
e_gadcon_layout_pack_size_set(gcc->o_base, w);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -1113,6 +1118,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
|
|||
else if (gcc->o_base)
|
||||
e_gadcon_layout_pack_size_set(gcc->o_base, h);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_FLOAT:
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
|
@ -1280,7 +1286,8 @@ e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int
|
|||
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
|
||||
|
||||
if (gcc->o_box) evas_object_geometry_get(gcc->o_base, x, y, w, h);
|
||||
else if (gcc->o_base) evas_object_geometry_get(gcc->o_base, x, y, w, h);
|
||||
else if (gcc->o_base)
|
||||
evas_object_geometry_get(gcc->o_base, x, y, w, h);
|
||||
else
|
||||
{
|
||||
if (x) *x = 0;
|
||||
|
@ -1567,7 +1574,8 @@ e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord
|
|||
else d = 0;
|
||||
}
|
||||
if (d < 0.0) d = 0.0;
|
||||
else if (d > 1.0) d = 1.0;
|
||||
else if (d > 1.0)
|
||||
d = 1.0;
|
||||
if (!gcc->scroll_timer)
|
||||
gcc->scroll_timer =
|
||||
ecore_timer_add(0.01, _e_gadcon_cb_client_scroll_timer, gcc);
|
||||
|
@ -1590,19 +1598,19 @@ e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data)
|
|||
EAPI Eina_Bool
|
||||
e_gadcon_site_is_shelf(E_Gadcon_Site site)
|
||||
{
|
||||
return (site == E_GADCON_SITE_SHELF);
|
||||
return site == E_GADCON_SITE_SHELF;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_gadcon_site_is_desktop(E_Gadcon_Site site)
|
||||
{
|
||||
return (site == E_GADCON_SITE_DESKTOP);
|
||||
return site == E_GADCON_SITE_DESKTOP;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site)
|
||||
{
|
||||
return (site == E_GADCON_SITE_EFM_TOOLBAR);
|
||||
return site == E_GADCON_SITE_EFM_TOOLBAR;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
|
@ -1614,6 +1622,7 @@ e_gadcon_site_is_any_toolbar(E_Gadcon_Site site)
|
|||
case E_GADCON_SITE_TOOLBAR:
|
||||
case E_GADCON_SITE_EFM_TOOLBAR:
|
||||
return EINA_TRUE;
|
||||
|
||||
default:
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
@ -1629,6 +1638,7 @@ e_gadcon_site_is_not_toolbar(E_Gadcon_Site site)
|
|||
case E_GADCON_SITE_TOOLBAR:
|
||||
case E_GADCON_SITE_EFM_TOOLBAR:
|
||||
return EINA_FALSE;
|
||||
|
||||
default:
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
@ -2223,7 +2233,6 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
|
|||
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
|
||||
gcc->config.res = h;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
gcc->dx += x;
|
||||
|
@ -2534,7 +2543,8 @@ _e_gadcon_cb_dnd_move(void *data, const char *type __UNUSED__, void *event)
|
|||
/* If we move in the same gadcon as the client originates */
|
||||
if (drag_gcc->gadcon == gc) gcc = drag_gcc;
|
||||
/* If we move in the newly entered gadcon */
|
||||
else if (new_gcc->gadcon == gc) gcc = new_gcc;
|
||||
else if (new_gcc->gadcon == gc)
|
||||
gcc = new_gcc;
|
||||
if (gcc)
|
||||
{
|
||||
Evas_Coord dx, dy;
|
||||
|
@ -2595,7 +2605,8 @@ _e_gadcon_cb_drop(void *data, const char *type __UNUSED__, void *event __UNUSED_
|
|||
|
||||
gc = data;
|
||||
if (drag_gcc->gadcon == gc) gcc = drag_gcc;
|
||||
else if ((new_gcc) && (new_gcc->gadcon == gc)) gcc = new_gcc;
|
||||
else if ((new_gcc) && (new_gcc->gadcon == gc))
|
||||
gcc = new_gcc;
|
||||
else return; /* make clang happy */
|
||||
|
||||
gc->cf->clients = eina_list_append(gc->cf->clients, gcc->cf);
|
||||
|
@ -2763,6 +2774,7 @@ _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m __UNUSED__, E_Menu_Ite
|
|||
_e_gadcon_client_save(gcc);
|
||||
e_gadcon_layout_thaw(gcc->gadcon->o_container);
|
||||
}
|
||||
|
||||
/*
|
||||
static void
|
||||
_e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
|
@ -3563,7 +3575,6 @@ _e_gadcon_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
|||
{
|
||||
sd->w = h;
|
||||
sd->h = w;
|
||||
|
||||
}
|
||||
|
||||
_e_gadcon_layout_smart_reconfigure(sd);
|
||||
|
@ -3794,8 +3805,10 @@ _e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2
|
|||
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
|
||||
|
||||
if ((!bi->gcc->state_info.seq) && (!bi2->gcc->state_info.seq)) return 0;
|
||||
else if (!bi->gcc->state_info.seq) return 1;
|
||||
else if (!bi2->gcc->state_info.seq) return -1;
|
||||
else if (!bi->gcc->state_info.seq)
|
||||
return 1;
|
||||
else if (!bi2->gcc->state_info.seq)
|
||||
return -1;
|
||||
return bi->gcc->state_info.seq - bi2->gcc->state_info.seq;
|
||||
}
|
||||
|
||||
|
@ -3807,7 +3820,7 @@ _e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2)
|
|||
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
|
||||
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
|
||||
|
||||
return (bi->x - bi2->x);
|
||||
return bi->x - bi2->x;
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -3818,7 +3831,8 @@ _e_gadcon_layout_smart_containers_sort_cb(const void *d1, const void *d2)
|
|||
lc = d1;
|
||||
lc2 = d2;
|
||||
if (lc->pos < lc2->pos) return -1;
|
||||
else if (lc->pos > lc2->pos) return 1;
|
||||
else if (lc->pos > lc2->pos)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -3829,7 +3843,7 @@ _e_gadcon_layout_smart_seq_sort_cb(const void *d1, const void *d2)
|
|||
|
||||
bi = d1;
|
||||
bi2 = d2;
|
||||
return (bi->gcc->state_info.seq - bi2->gcc->state_info.seq);
|
||||
return bi->gcc->state_info.seq - bi2->gcc->state_info.seq;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -4048,7 +4062,6 @@ _e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd)
|
|||
E_Layout_Item_Container *lc;
|
||||
E_Gadcon_Layout_Item *bi;
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(sd->items, l, item)
|
||||
{
|
||||
bi = evas_object_data_get(item, "e_gadcon_layout_data");
|
||||
|
|
Loading…
Reference in New Issue