_evry_plugin_select(s, NULL);
}
- /* plugin is visible */
- if ((sel->state == s) &&
+ if ((s->plugin && sel->state == s) &&
+ /* plugin is current */
((s->plugin == p) ||
- (s->plugin == s->aggregator)))
+ /* plugin items are shown in aggregator */
+ ((s->plugin == s->aggregator) && p->config->aggregate)))
{
_evry_selector_update(sel);
if (_evry_view_update(s))
+ /* XXX when there is a case where view disappears
+ check this one! is swallow always visible ? */
_evry_view_show(s->view, 0);
-
}
/* switch back to subject selector when no current items */
}
else
{
+ int to_side = 0;
+
switch (edge)
{
case E_ZONE_EDGE_TOP_LEFT:
- x = 3 - offset_s;
- y = 3 - offset_s;
+ x = to_side - offset_s;
+ y = to_side - offset_s;
break;
case E_ZONE_EDGE_TOP_RIGHT:
- x = zone->w - (mw + offset_s + 3);
- y = 3 - offset_s;
+ x = zone->w - (mw + offset_s + to_side);
+ y = to_side - offset_s;
break;
case E_ZONE_EDGE_BOTTOM_RIGHT:
- x = zone->w - (mw + offset_s + 3);
- y = zone->h - (mh + offset_s + 3);
+ x = zone->w - (mw + offset_s + to_side);
+ y = zone->h - (mh + offset_s + to_side);
break;
case E_ZONE_EDGE_BOTTOM_LEFT:
- x = 3 - offset_s;
- y = zone->h - (mh + offset_s + 3);
+ x = to_side - offset_s;
+ y = zone->h - (mh + offset_s + to_side);
break;
default:
Smart_Data *sd = evas_object_smart_data_get(obj);
sd->x = x;
sd->y = y;
- /* printf("move %p %d %d\n", sd, x, y); */
_e_smart_reconfigure(obj);
}
View *v;
Ecore_Event_Handler *h;
- if (!s->plugin)
- return NULL;
-
v = E_NEW(View, 1);
v->view = *view;
v->view.clear_timer = NULL;
v->state = s;
v->evas = evas_object_evas_get(swallow);
- if ((s->selector->states->next) &&
- ((s->plugin->config->view_mode < 0) ||
- (!strcmp(s->plugin->name, N_("All")))))
- v->mode = parent->mode;
- else if (s->plugin->config->view_mode >= 0)
- v->mode = s->plugin->config->view_mode;
+ if (s->plugin)
+ {
+ if ((s->selector->states->next) &&
+ ((s->plugin->config->view_mode < 0) ||
+ (!strcmp(s->plugin->name, N_("All")))))
+ v->mode = parent->mode;
+ else if (s->plugin->config->view_mode >= 0)
+ v->mode = s->plugin->config->view_mode;
+ else
+ v->mode = evry_conf->view_mode;
+ }
else
- v->mode = evry_conf->view_mode;
+ {
+ if (s->selector->states->next)
+ v->mode = parent->mode;
+ else
+ v->mode = evry_conf->view_mode;
+ }
v->plugin = s->plugin;