[prev in list] [next in list] [prev in thread] [next in thread]
List: enlightenment-svn
Subject: E SVN: jeffdameth trunk/e/src/modules/everything
From: "Enlightenment SVN" <no-reply () enlightenment ! org>
Date: 2011-08-31 11:12:57
Message-ID: 20110831111257.24F33300001 () e2 ! enlightenment ! org
[Download RAW message or body]
Log:
e17/evry: dont update selector when changed plugin is not in current state
Author: jeffdameth
Date: 2011-08-31 04:12:56 -0700 (Wed, 31 Aug 2011)
New Revision: 63024
Trac: http://trac.enlightenment.org/e/changeset/63024
Modified:
trunk/e/src/modules/everything/evry.c
Modified: trunk/e/src/modules/everything/evry.c
===================================================================
--- trunk/e/src/modules/everything/evry.c 2011-08-31 10:51:04 UTC (rev 63023)
+++ trunk/e/src/modules/everything/evry.c 2011-08-31 11:12:56 UTC (rev 63024)
@@ -642,37 +642,41 @@
_evry_plugin_list_insert(s, p);
}
- _evry_aggregator_fetch(s);
-
- /* select first plugin */
- if ((!s->plugin) || (s->plugin_auto_selected) ||
- !(eina_list_data_find(s->cur_plugins, s->plugin)))
+ if (sel->state == s)
{
- _evry_plugin_select(s, NULL);
- }
+ _evry_aggregator_fetch(s);
- if ((s->plugin && (sel->state == s)) &&
- /* plugin is current */
- ((s->plugin == p) ||
- /* plugin items are shown in aggregator */
- ((s->plugin == s->aggregator) && p->config->aggregate)))
- {
- _evry_selector_update(sel);
+ /* select first plugin */
+ if ((!s->plugin) || (s->plugin_auto_selected) ||
+ !(eina_list_data_find(s->cur_plugins, s->plugin)))
+ {
+ _evry_plugin_select(s, NULL);
+ }
- if (_evry_view_update(win, s))
- /* XXX when there is a case where view disappears
- check this one! is swallow always visible ? */
- _evry_view_show(win, s->view, 0);
- }
+ if ((s->plugin && (sel->state == s)) &&
+ /* plugin is current */
+ ((s->plugin == p) ||
+ /* plugin items are shown in aggregator */
+ ((s->plugin == s->aggregator) && p->config->aggregate)))
+ {
+ _evry_selector_update(sel);
- /* switch back to subject selector when no current items */
- if ((sel == SUBJ_SEL) &&
- (!(s->plugin) || !(s->plugin->items)) &&
- (CUR_SEL == ACTN_SEL))
- {
- _evry_selectors_switch(win, -1);
- _evry_clear(SUBJ_SEL);
+ if (_evry_view_update(win, s))
+ /* XXX when there is a case where view disappears
+ check this one! is swallow always visible ? */
+ _evry_view_show(win, s->view, 0);
+ }
+
+ /* switch back to subject selector when no current items */
+ if ((sel == SUBJ_SEL) &&
+ (!(s->plugin) || !(s->plugin->items)) &&
+ (CUR_SEL == ACTN_SEL))
+ {
+ _evry_selectors_switch(win, -1);
+ _evry_clear(SUBJ_SEL);
+ }
}
+
}
else if (action == EVRY_UPDATE_REFRESH)
{
@@ -1725,7 +1729,9 @@
_evry_state_pop(sel, 0);
s = sel->state;
+
/* _evry_aggregator_fetch(s); */
+
_evry_selector_update(sel);
if (sel == SUBJ_SEL)
_evry_selector_update_actions(ACTN_SEL);
@@ -2548,8 +2554,7 @@
if (s->delete_me)
{
- if (s->view)
- s->view->destroy(s->view);
+ if (s->view) s->view->destroy(s->view);
s->clear_timer = NULL;
E_FREE(s->inp);
E_FREE(s);
@@ -2573,6 +2578,12 @@
static void
_evry_view_hide(Evry_Window *win, Evry_View *v, int slide)
{
+ if (v->state->delete_me)
+ {
+ _evry_state_clear(win);
+ return;
+ }
+
_evry_state_clear(win);
if (!v) return;
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
enlightenment-svn mailing list
enlightenment-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic