forked from enlightenment/enlightenment
e_util_comp_zone_number_get() -> e_comp_zone_number_get()
This commit is contained in:
parent
a8f9c44b46
commit
b8d4072a13
|
@ -1305,7 +1305,7 @@ ACT_FN_GO(window_zone_move_by, )
|
|||
move = eina_list_count(ec->zone->comp->zones) - 1;
|
||||
else if ((unsigned int)move >= eina_list_count(ec->zone->comp->zones))
|
||||
move = 0;
|
||||
zone = e_util_comp_zone_number_get(0, move);
|
||||
zone = e_comp_zone_number_get(e_comp, move);
|
||||
if (!zone) return;
|
||||
max = ec->maximized;
|
||||
fs = ec->fullscreen_policy;
|
||||
|
@ -1655,14 +1655,14 @@ ACT_FN_GO(screen_send_to, )
|
|||
if (scr != -1)
|
||||
scr = scr % eina_list_count(e_manager_list());
|
||||
if (scr < 0) scr += eina_list_count(e_manager_list());
|
||||
zone2 = e_util_comp_zone_number_get(scr, 0);
|
||||
zone2 = e_comp_zone_number_get(e_comp, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (scr != -1)
|
||||
scr = scr % eina_list_count(zone->comp->zones);
|
||||
if (scr < 0) scr += eina_list_count(zone->comp->zones);
|
||||
zone2 = e_util_comp_zone_number_get(0, scr);
|
||||
zone2 = e_comp_zone_number_get(e_comp, scr);
|
||||
}
|
||||
if ((zone2) && (zone != zone2))
|
||||
{
|
||||
|
@ -1692,7 +1692,7 @@ ACT_FN_GO(screen_send_by, )
|
|||
if (scr != -1)
|
||||
scr = scr % eina_list_count(e_manager_list());
|
||||
if (scr < 0) scr += eina_list_count(e_manager_list());
|
||||
zone2 = e_util_comp_zone_number_get(scr, 0);
|
||||
zone2 = e_comp_zone_number_get(e_comp, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1700,7 +1700,7 @@ ACT_FN_GO(screen_send_by, )
|
|||
if (scr != -1)
|
||||
scr = scr % eina_list_count(zone->comp->zones);
|
||||
if (scr < 0) scr += eina_list_count(zone->comp->zones);
|
||||
zone2 = e_util_comp_zone_number_get(0, scr);
|
||||
zone2 = e_comp_zone_number_get(e_comp, scr);
|
||||
}
|
||||
if ((zone2) && (zone != zone2))
|
||||
{
|
||||
|
@ -1729,7 +1729,7 @@ ACT_FN_GO(screen_send_by, )
|
|||
act; \
|
||||
} } } \
|
||||
else { \
|
||||
zone = e_util_comp_zone_number_get(con_num, zone_num); \
|
||||
zone = e_comp_zone_number_get(e_comp, zone_num); \
|
||||
if (zone) act; \
|
||||
}
|
||||
|
||||
|
|
|
@ -138,7 +138,7 @@ e_shelf_config_update(void)
|
|||
E_Zone *zone;
|
||||
|
||||
if (cf_es->id <= 0) cf_es->id = id + 1;
|
||||
zone = e_util_comp_zone_number_get(cf_es->manager, cf_es->zone);
|
||||
zone = e_comp_zone_number_get(e_comp, cf_es->zone);
|
||||
if (zone)
|
||||
e_shelf_config_new(zone, cf_es);
|
||||
id = cf_es->id;
|
||||
|
|
|
@ -637,8 +637,8 @@ _adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *
|
|||
ow = e_widget_radio_add(evas, _("This Desktop"), E_CONFIG_WALLPAPER_DESK, rg);
|
||||
e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0);
|
||||
ow = e_widget_radio_add(evas, _("This Screen"), E_CONFIG_WALLPAPER_SCREEN, rg);
|
||||
if (!(e_util_comp_zone_number_get(0, 1) ||
|
||||
(e_util_comp_zone_number_get(1, 0))))
|
||||
if (!(e_comp_zone_number_get(e_comp, 1) ||
|
||||
(e_comp_zone_number_get(e_comp, 0))))
|
||||
e_widget_disabled_set(ow, 1);
|
||||
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
|
||||
e_widget_table_object_append(ot, of, 0, 3, 2, 1, 1, 0, 1, 0);
|
||||
|
|
|
@ -252,8 +252,8 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
|
|||
if (!(comp = e_util_comp_current_get()))
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
zn = ev->ec->illume.quickpanel.zone;
|
||||
zone = e_util_comp_zone_number_get(comp->num, zn);
|
||||
if (!zone) zone = e_util_comp_zone_number_get(comp->num, 0);
|
||||
zone = e_comp_zone_number_get(e_comp, zn);
|
||||
if (!zone) zone = e_comp_zone_number_get(e_comp, 0);
|
||||
if (!zone) return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
|
@ -303,8 +303,8 @@ _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, v
|
|||
if (!(comp = e_util_comp_current_get()))
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
zn = ev->ec->illume.quickpanel.zone;
|
||||
zone = e_util_comp_zone_number_get(comp->num, zn);
|
||||
if (!zone) zone = e_util_comp_zone_number_get(comp->num, 0);
|
||||
zone = e_comp_zone_number_get(e_comp, zn);
|
||||
if (!zone) zone = e_comp_zone_number_get(e_comp, 0);
|
||||
if (!zone) return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue