vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'terminology-1.7'

This commit is contained in:
Boris Faure 2020-06-23 22:39:46 +02:00
parent faf6ff86b8 157d65e7ec
commit 8c88c876cd
Signed by untrusted user who does not match committer: borisfaure
GPG Key ID: 35C0410516166BE8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/win.c
View File

@ -1280,7 +1280,6 @@ _win_focused_term_get(const Term_Container *tc)
assert (tc->type == TERM_CONTAINER_TYPE_WIN); assert (tc->type == TERM_CONTAINER_TYPE_WIN);
wn = (Win*) tc; wn = (Win*) tc;
if (tc->is_focused && wn->child) if (tc->is_focused && wn->child)
term = wn->child->focused_term_get(wn->child); term = wn->child->focused_term_get(wn->child);
return term; return term;
@ -1543,8 +1542,8 @@ _win_split(Term_Container *tc, Term_Container *child,
child->unfocus(child, tc_split); child->unfocus(child, tc_split);
tc->swallow(tc, NULL, tc_split); tc->swallow(tc, NULL, tc_split);
tc_split->is_focused = EINA_TRUE; tc_split->is_focused = EINA_TRUE;
tc_solo_new->focus(tc_solo_new, tc_split);
tc_split->focus(tc_split, tc_solo_new); tc_split->focus(tc_split, tc_solo_new);
tc_solo_new->focus(tc_solo_new, tc_split);
} }
else else
{ {
@ -4515,7 +4514,6 @@ _tabs_focused_term_get(const Term_Container *tc)
assert (tc->type == TERM_CONTAINER_TYPE_TABS); assert (tc->type == TERM_CONTAINER_TYPE_TABS);
tabs = (Tabs*)tc; tabs = (Tabs*)tc;
return tc->is_focused ? return tc->is_focused ?
tabs->current->tc->focused_term_get(tabs->current->tc) tabs->current->tc->focused_term_get(tabs->current->tc)
: NULL; : NULL;