enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

fix tab switching to zoom FROM current TO next/prev slot properly when 

just next/prev switching.
This commit is contained in:
Carsten Haitzler 2013-03-20 09:04:05 +09:00
parent 21abbe6db8
commit 1880987f63
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/main.c
View File

@ -1152,7 +1152,7 @@ _sel_go(Split *sp, Term *term)
sel_zoom(sp->sel, z);
if (term != sp->term)
{
sel_entry_selected_set(sp->sel, term->sel);
sel_entry_selected_set(sp->sel, term->sel, EINA_TRUE);
sel_exit(sp->sel);
}
elm_object_focus_set(sp->sel, EINA_TRUE);

12
src/bin/sel.c
View File

@ -123,7 +123,7 @@ _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
if (l->next)
{
en = l->next->data;
sel_entry_selected_set(obj, en->obj);
sel_entry_selected_set(obj, en->obj, EINA_FALSE);
break;
}
}
@ -141,7 +141,7 @@ _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
if (l->prev)
{
en = l->prev->data;
sel_entry_selected_set(obj, en->obj);
sel_entry_selected_set(obj, en->obj, EINA_FALSE);
break;
}
}
@ -170,7 +170,7 @@ _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
{
if (en->selected_orig) entry = en->obj;
}
if (entry) sel_entry_selected_set(obj, entry);
if (entry) sel_entry_selected_set(obj, entry, EINA_FALSE);
sd->select_me = EINA_FALSE;
sd->exit_me = EINA_TRUE;
if (sd->autozoom_timeout)
@ -221,7 +221,7 @@ _layout(Evas_Object *obj)
sd->px = sd->px0 + ((sd->px1 - sd->px0) * sd->interp);
sd->py = sd->py0 + ((sd->py1 - sd->py0) * sd->interp);
px = sd->px;
py = sd->py;
@ -467,7 +467,7 @@ sel_go(Evas_Object *obj)
}
void
sel_entry_selected_set(Evas_Object *obj, Evas_Object *entry)
sel_entry_selected_set(Evas_Object *obj, Evas_Object *entry, Eina_Bool keep_before)
{
Sel *sd = evas_object_smart_data_get(obj);
Eina_List *l;
@ -488,7 +488,7 @@ sel_entry_selected_set(Evas_Object *obj, Evas_Object *entry)
en->selected = EINA_FALSE;
}
}
en->selected_before = EINA_FALSE;
if (!keep_before) en->selected_before = EINA_FALSE;
}
_transit(obj, 0.3);
}

2
src/bin/sel.h
View File

@ -6,7 +6,7 @@
Evas_Object *sel_add(Evas_Object *parent);
void sel_entry_add(Evas_Object *obj, Evas_Object *entry, Eina_Bool selected, Config *config);
void sel_go(Evas_Object *obj);
void sel_entry_selected_set(Evas_Object *obj, Evas_Object *entry);
void sel_entry_selected_set(Evas_Object *obj, Evas_Object *entry, Eina_Bool keep_before);
void sel_zoom(Evas_Object *obj, double zoom);
void sel_orig_zoom_set(Evas_Object *obj, double zoom);
void sel_exit(Evas_Object *obj);