forked from enlightenment/enlightenment
zone != desk. it was always about per desk deskshows, not per zone.
SVN revision: 24088
This commit is contained in:
parent
03f133c746
commit
fdde0e6490
|
@ -1428,22 +1428,24 @@ ACT_FN_GO(edit_mode_toggle)
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
ACT_FN_GO(zone_deskshow_toggle)
|
ACT_FN_GO(desk_deskshow_toggle)
|
||||||
{
|
{
|
||||||
E_Border *bd;
|
E_Border *bd;
|
||||||
E_Border_List *bl;
|
E_Border_List *bl;
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
E_Desk *desk;
|
||||||
|
|
||||||
zone = _e_actions_zone_get(obj);
|
zone = _e_actions_zone_get(obj);
|
||||||
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
||||||
if (zone)
|
if (zone)
|
||||||
{
|
{
|
||||||
|
desk = e_desk_current_get(zone);
|
||||||
bl = e_container_border_list_first(zone->container);
|
bl = e_container_border_list_first(zone->container);
|
||||||
while ((bd = e_container_border_list_next(bl)))
|
while ((bd = e_container_border_list_next(bl)))
|
||||||
{
|
{
|
||||||
if (bd->desk == e_desk_current_get(bd->zone))
|
if (bd->desk == desk)
|
||||||
{
|
{
|
||||||
if (zone->deskshow_toggle)
|
if (desk->deskshow_toggle)
|
||||||
{
|
{
|
||||||
if (bd->deskshow) e_border_uniconify(bd);
|
if (bd->deskshow) e_border_uniconify(bd);
|
||||||
bd->deskshow = 0;
|
bd->deskshow = 0;
|
||||||
|
@ -1458,7 +1460,7 @@ ACT_FN_GO(zone_deskshow_toggle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zone->deskshow_toggle = zone->deskshow_toggle ? 0 : 1;
|
desk->deskshow_toggle = desk->deskshow_toggle ? 0 : 1;
|
||||||
e_container_border_list_free(bl);
|
e_container_border_list_free(bl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1717,10 +1719,10 @@ e_actions_init(void)
|
||||||
e_register_action_predef_name(_("Desktop"), _("Flip Desktop By..."),
|
e_register_action_predef_name(_("Desktop"), _("Flip Desktop By..."),
|
||||||
"desk_flip_by", NULL, EDIT_RESTRICT_ACTION, 0);
|
"desk_flip_by", NULL, EDIT_RESTRICT_ACTION, 0);
|
||||||
|
|
||||||
/* zone_deskshow_toggle */
|
/* desk_deskshow_toggle */
|
||||||
ACT_GO(zone_deskshow_toggle);
|
ACT_GO(desk_deskshow_toggle);
|
||||||
e_register_action_predef_name(_("Desktop"), _("Show The Desktop"),
|
e_register_action_predef_name(_("Desktop"), _("Show The Desktop"),
|
||||||
"zone_deskshow_toggle", NULL,
|
"desk_deskshow_toggle", NULL,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0);
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0);
|
||||||
|
|
||||||
/* desk_linear_flip_to */
|
/* desk_linear_flip_to */
|
||||||
|
|
|
@ -869,7 +869,7 @@ e_config_init(void)
|
||||||
"desk_lock", NULL);
|
"desk_lock", NULL);
|
||||||
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "d",
|
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "d",
|
||||||
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
|
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
|
||||||
"zone_deskshow_toggle", NULL);
|
"desk_deskshow_toggle", NULL);
|
||||||
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
|
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
|
||||||
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
|
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
|
||||||
"screen_send_by", "-1");
|
"screen_send_by", "-1");
|
||||||
|
|
|
@ -21,6 +21,7 @@ struct _E_Desk
|
||||||
const char *name;
|
const char *name;
|
||||||
int x, y;
|
int x, y;
|
||||||
char visible : 1;
|
char visible : 1;
|
||||||
|
unsigned int deskshow_toggle : 1;
|
||||||
|
|
||||||
Evas_Object *bg_object;
|
Evas_Object *bg_object;
|
||||||
};
|
};
|
||||||
|
|
|
@ -380,7 +380,7 @@ _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
{
|
{
|
||||||
E_Action *act;
|
E_Action *act;
|
||||||
|
|
||||||
act = e_action_find("zone_deskshow_toggle");
|
act = e_action_find("desk_deskshow_toggle");
|
||||||
if (act) act->func.go(E_OBJECT(m->zone), NULL);
|
if (act) act->func.go(E_OBJECT(m->zone), NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ struct _E_Zone
|
||||||
unsigned int num;
|
unsigned int num;
|
||||||
E_Container *container;
|
E_Container *container;
|
||||||
int fullscreen;
|
int fullscreen;
|
||||||
unsigned int deskshow_toggle : 1;
|
|
||||||
|
|
||||||
Evas_Object *bg_object;
|
Evas_Object *bg_object;
|
||||||
Evas_Object *bg_event_object;
|
Evas_Object *bg_event_object;
|
||||||
|
|
Loading…
Reference in New Issue