summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2015-06-01 21:19:14 +0200
committerBoris Faure <billiob@gmail.com>2015-06-01 21:19:14 +0200
commit9ecda225b89c3c181a94a60a4a3f1b4288a264ad (patch)
treea1d2a2350b885ede0598bb26c6788a37051d00b5 /src
parent231ff2514a0369cffd7bee0f7a35ca66c732639a (diff)
fix focus wrt settings. Closes T2460
Diffstat (limited to 'src')
-rw-r--r--src/bin/win.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/bin/win.c b/src/bin/win.c
index ec0b01e..2bfea24 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -816,12 +816,14 @@ _win_unfocus(Term_Container *tc, Term_Container *relative)
816 816
817 wn = (Win*) tc; 817 wn = (Win*) tc;
818 818
819 tc->is_focused = EINA_FALSE;
820 if (relative != wn->child) 819 if (relative != wn->child)
821 wn->child->unfocus(wn->child, tc); 820 {
821 tc->is_focused = EINA_FALSE;
822 wn->child->unfocus(wn->child, tc);
822 823
823 if ((wn->cmdbox_up) && (wn->cmdbox)) 824 if ((wn->cmdbox_up) && (wn->cmdbox))
824 elm_object_focus_set(wn->cmdbox, EINA_FALSE); 825 elm_object_focus_set(wn->cmdbox, EINA_FALSE);
826 }
825} 827}
826 828
827static void 829static void
@@ -3781,6 +3783,7 @@ static void
3781_cb_options_done(void *data) 3783_cb_options_done(void *data)
3782{ 3784{
3783 Win *wn = data; 3785 Win *wn = data;
3786 Term_Container *tc = (Term_Container*) wn;
3784 Eina_List *l; 3787 Eina_List *l;
3785 Term *term; 3788 Term *term;
3786 3789
@@ -3791,8 +3794,10 @@ _cb_options_done(void *data)
3791 { 3794 {
3792 elm_object_focus_set(term->termio, EINA_TRUE); 3795 elm_object_focus_set(term->termio, EINA_TRUE);
3793 termio_event_feed_mouse_in(term->termio); 3796 termio_event_feed_mouse_in(term->termio);
3797 return;
3794 } 3798 }
3795 } 3799 }
3800 tc->focus(tc, tc);
3796} 3801}
3797 3802
3798static void 3803static void