diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2014-06-16 12:21:21 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2014-06-16 13:35:57 -0400 |
| commit | 32c1638da79a7ec1a7b52fb6220271ae63e1a7fb (patch) | |
| tree | 283b6337f14349f72fee84cb51e95a93cbb81b36 /src/modules/ibar/e_mod_main.c | |
| parent | ace6b249550a47f48112fe63932df6b3932ded4a (diff) | |
| download | enlightenment-32c1638da79a7ec1a7b52fb6220271ae63e1a7fb.tar.gz | |
simplify ibar client desk visibility check
Diffstat (limited to 'src/modules/ibar/e_mod_main.c')
| -rw-r--r-- | src/modules/ibar/e_mod_main.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 8c823788ba..a287ee9195 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -1283,18 +1283,10 @@ _ibar_icon_menu_client_add(IBar_Icon *ic, E_Client *ec) edje_object_part_text_set(it, "e.text.title", txt); if (ec->focused) edje_object_signal_emit(it, "e,state,focused", "e"); - if (ec->sticky) - { - if (ec->zone != ic->ibar->inst->gcc->gadcon->zone) - edje_object_signal_emit(it, "e,state,other,screen", "e"); - } - else - { - if (ec->zone != ic->ibar->inst->gcc->gadcon->zone) - edje_object_signal_emit(it, "e,state,other,screen", "e"); - else if (ec->desk != e_desk_current_get(ic->ibar->inst->gcc->gadcon->zone)) - edje_object_signal_emit(it, "e,state,other,desk", "e"); - } + if (ec->sticky || (ec->zone != ic->ibar->inst->gcc->gadcon->zone)) + edje_object_signal_emit(it, "e,state,other,screen", "e"); + else if (!ec->desk->visible) + edje_object_signal_emit(it, "e,state,other,desk", "e"); edje_object_calc_force(it); edje_object_size_min_calc(it, &w, &h); evas_object_size_hint_min_set(it, w, h); |