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

Revert "move split out of Term_Container" 

This reverts commit 9d3e2d66c1.
This commit is contained in:
Carsten Haitzler 2014-12-03 08:42:39 +09:00
parent 56c5db34e1
commit d43513e71b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/term_container.h
View File

@ -44,6 +44,8 @@ struct _Term_Container {
Term *(*find_term_at_coords)(Term_Container *container,
Evas_Coord mx, Evas_Coord my);
void (*size_eval)(Term_Container *container, Sizeinfo *info);
void (*split)(Term_Container *container, const char *cmd,
Eina_Bool is_horizontal); /* TODO: only for solo, move out ? */
void (*swallow)(Term_Container *container, Term_Container *orig,
Term_Container *new_child);
void (*focus)(Term_Container *tc, Term_Container *relative);

12
src/bin/win.c
View File

@ -453,6 +453,7 @@ _solo_new(Term *term, Win *wn)
tc->get_evas_object = _solo_get_evas_object;
tc->find_term_at_coords = _solo_find_term_at_coords;
tc->size_eval = _solo_size_eval;
tc->split = _solo_split;
tc->swallow = NULL;
tc->focus = _solo_focus;
tc->set_title = _solo_set_title;
@ -854,6 +855,7 @@ win_new(const char *name, const char *role, const char *title,
tc->get_evas_object = _win_get_evas_object;
tc->find_term_at_coords = _win_find_term_at_coords;
tc->size_eval = _win_size_eval;
tc->split = NULL;
tc->swallow = _win_swallow;
tc->focus = _win_focus;
tc->set_title = _win_set_title;
@ -1340,6 +1342,7 @@ _split_new(Term_Container *tc1, Term_Container *tc2, Eina_Bool is_horizontal)
tc->get_evas_object = _split_get_evas_object;
tc->find_term_at_coords = _split_find_term_at_coords;
tc->size_eval = _split_size_eval;
tc->split = NULL;
tc->swallow = _split_swallow;
tc->focus = _split_focus;
tc->set_title = _split_set_title;
@ -1765,7 +1768,7 @@ split_horizontally(Evas_Object *win EINA_UNUSED, Evas_Object *term,
if (!tm) return;
tc = tm->container;
_solo_split(tc, cmd, EINA_TRUE);
tc->split(tc, cmd, EINA_TRUE);
}
void
@ -1779,7 +1782,7 @@ split_vertically(Evas_Object *win EINA_UNUSED, Evas_Object *term,
if (!tm) return;
tc = tm->container;
_solo_split(tc, cmd, EINA_FALSE);
tc->split(tc, cmd, EINA_FALSE);
}
#if 0
@ -2658,6 +2661,7 @@ _tabs_new(Term_Container *child, Term_Container *parent)
tc->get_evas_object = _tabs_get_evas_object;
tc->find_term_at_coords = _tabs_find_term_at_coords;
tc->size_eval = _tabs_size_eval;
tc->split = NULL;
tc->swallow = _tabs_swallow;
tc->focus = _tabs_focus;
tc->set_title = _tabs_set_title;
@ -3236,7 +3240,7 @@ _cb_split_h(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
Term_Container *tc = term->container;
assert(tc->type == TERM_CONTAINER_TYPE_SOLO);
_solo_split(tc, NULL, EINA_TRUE);
tc->split(tc, NULL, EINA_TRUE);
}
static void
@ -3246,7 +3250,7 @@ _cb_split_v(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
Term_Container *tc = term->container;
assert(tc->type == TERM_CONTAINER_TYPE_SOLO);
_solo_split(tc, NULL, EINA_FALSE);
tc->split(tc, NULL, EINA_FALSE);
}
static void