forked from enlightenment/enlightenment
parent
c740f3fab7
commit
62907bbf51
|
@ -403,45 +403,40 @@ _e_winlist_size_adjust(void)
|
||||||
static void
|
static void
|
||||||
_e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
|
_e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
|
||||||
{
|
{
|
||||||
int ok;
|
E_Winlist_Win *ww;
|
||||||
|
Evas_Coord mw, mh;
|
||||||
|
Evas_Object *o;
|
||||||
|
|
||||||
ok = 1;
|
|
||||||
if ((!bd->client.icccm.accepts_focus) &&
|
if ((!bd->client.icccm.accepts_focus) &&
|
||||||
(!bd->client.icccm.take_focus)) ok = 0;
|
(!bd->client.icccm.take_focus)) return;
|
||||||
if (bd->client.netwm.state.skip_taskbar) ok = 0;
|
if (bd->client.netwm.state.skip_taskbar) return;
|
||||||
if (bd->user_skip_winlist) ok = 0;
|
if (bd->user_skip_winlist) return;
|
||||||
if (bd->iconic)
|
if (bd->iconic)
|
||||||
{
|
{
|
||||||
if (!e_config->winlist_list_show_iconified) ok = 0;
|
if (!e_config->winlist_list_show_iconified) return;
|
||||||
if ((bd->zone != zone) &&
|
if ((bd->zone != zone) &&
|
||||||
(!e_config->winlist_list_show_other_screen_iconified)) ok = 0;
|
(!e_config->winlist_list_show_other_screen_iconified)) return;
|
||||||
if ((bd->desk != desk) &&
|
if ((bd->desk != desk) &&
|
||||||
(!e_config->winlist_list_show_other_desk_iconified)) ok = 0;
|
(!e_config->winlist_list_show_other_desk_iconified)) return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (bd->sticky)
|
if (bd->sticky)
|
||||||
{
|
{
|
||||||
if ((bd->zone != zone) &&
|
if ((bd->zone != zone) &&
|
||||||
(!e_config->winlist_list_show_other_screen_windows)) ok = 0;
|
(!e_config->winlist_list_show_other_screen_windows)) return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (bd->desk != desk)
|
if (bd->desk != desk)
|
||||||
{
|
{
|
||||||
if ((bd->zone) && (bd->zone != zone))
|
if ((bd->zone) && (bd->zone != zone))
|
||||||
{
|
if (!e_config->winlist_list_show_other_screen_windows) return;
|
||||||
if (!e_config->winlist_list_show_other_screen_windows) ok = 0;
|
else
|
||||||
}
|
if (!e_config->winlist_list_show_other_desk_windows) return;
|
||||||
else if (!e_config->winlist_list_show_other_desk_windows) ok = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ok)
|
|
||||||
{
|
|
||||||
E_Winlist_Win *ww;
|
|
||||||
Evas_Coord mw, mh;
|
|
||||||
Evas_Object *o;
|
|
||||||
|
|
||||||
ww = calloc(1, sizeof(E_Winlist_Win));
|
ww = calloc(1, sizeof(E_Winlist_Win));
|
||||||
if (!ww) return;
|
if (!ww) return;
|
||||||
|
@ -471,10 +466,8 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
|
||||||
else if (bd->desk != desk)
|
else if (bd->desk != desk)
|
||||||
{
|
{
|
||||||
if (!((bd->sticky) && (bd->zone == zone)))
|
if (!((bd->sticky) && (bd->zone == zone)))
|
||||||
{
|
|
||||||
edje_object_signal_emit(ww->bg_object, "e,state,invisible", "e");
|
edje_object_signal_emit(ww->bg_object, "e,state,invisible", "e");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
edje_object_size_min_calc(ww->bg_object, &mw, &mh);
|
edje_object_size_min_calc(ww->bg_object, &mw, &mh);
|
||||||
e_box_pack_end(list_object, ww->bg_object);
|
e_box_pack_end(list_object, ww->bg_object);
|
||||||
|
@ -487,7 +480,6 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
|
||||||
);
|
);
|
||||||
e_object_ref(E_OBJECT(ww->border));
|
e_object_ref(E_OBJECT(ww->border));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_winlist_border_del(E_Border *bd)
|
_e_winlist_border_del(E_Border *bd)
|
||||||
|
|
Loading…
Reference in New Issue