billiob pushed a commit to branch terminology-1.7.
http://git.enlightenment.org/apps/terminology.git/commit/?id=157d65e7ec83090fc69795b2f408c9582f176788
commit 157d65e7ec83090fc69795b2f408c9582f176788
Author: Boris Faure <bill...@gmail.com>
Date: Tue Jun 23 22:38:28 2020 +0200
win: reorder calls to please _focus_validator()
---
src/bin/win.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index f1368b4..471d40b 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -1280,7 +1280,6 @@ _win_focused_term_get(const Term_Container *tc)
assert (tc->type == TERM_CONTAINER_TYPE_WIN);
wn = (Win*) tc;
-
if (tc->is_focused && wn->child)
term = wn->child->focused_term_get(wn->child);
return term;
@@ -1543,8 +1542,8 @@ _win_split(Term_Container *tc, Term_Container *child,
child->unfocus(child, tc_split);
tc->swallow(tc, NULL, tc_split);
tc_split->is_focused = EINA_TRUE;
- tc_solo_new->focus(tc_solo_new, tc_split);
tc_split->focus(tc_split, tc_solo_new);
+ tc_solo_new->focus(tc_solo_new, tc_split);
}
else
{
@@ -4515,7 +4514,6 @@ _tabs_focused_term_get(const Term_Container *tc)
assert (tc->type == TERM_CONTAINER_TYPE_TABS);
tabs = (Tabs*)tc;
-
return tc->is_focused ?
tabs->current->tc->focused_term_get(tabs->current->tc)
: NULL;
--
