forked from enlightenment/enlightenment
fsel no longer changes entry text when changing directory
ticket #1695 SVN revision: 78656
This commit is contained in:
parent
91fc9e6634
commit
5a20be6915
|
@ -25,6 +25,7 @@ struct _E_Widget_Data
|
||||||
void (*chg_func)(void *data, Evas_Object *obj);
|
void (*chg_func)(void *data, Evas_Object *obj);
|
||||||
void *chg_data;
|
void *chg_data;
|
||||||
int preview;
|
int preview;
|
||||||
|
Eina_Bool nochange : 1; // block changing of entry
|
||||||
};
|
};
|
||||||
|
|
||||||
static void _e_wid_del_hook(Evas_Object *obj);
|
static void _e_wid_del_hook(Evas_Object *obj);
|
||||||
|
@ -163,7 +164,9 @@ _e_wid_fsel_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_i
|
||||||
wd = data;
|
wd = data;
|
||||||
if (!wd->o_files_fm) return;
|
if (!wd->o_files_fm) return;
|
||||||
if (e_fm2_selected_count(wd->o_files_fm)) return;
|
if (e_fm2_selected_count(wd->o_files_fm)) return;
|
||||||
|
wd->nochange = EINA_TRUE;
|
||||||
e_fm2_first_sel(wd->o_files_fm);
|
e_fm2_first_sel(wd->o_files_fm);
|
||||||
|
wd->nochange = EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -205,6 +208,7 @@ _e_wid_fsel_sel_chg(E_Widget_Data *wd, Evas_Object *fm)
|
||||||
struct stat st;
|
struct stat st;
|
||||||
Eina_Bool preview;
|
Eina_Bool preview;
|
||||||
|
|
||||||
|
if (wd->nochange) return;
|
||||||
preview = !!fm;
|
preview = !!fm;
|
||||||
fm = fm ?: wd->o_files_fm;
|
fm = fm ?: wd->o_files_fm;
|
||||||
selected = e_fm2_selected_list_get(fm);
|
selected = e_fm2_selected_list_get(fm);
|
||||||
|
@ -477,7 +481,9 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
|
||||||
evas_object_show(wd->o_entry);
|
evas_object_show(wd->o_entry);
|
||||||
evas_object_show(wd->o_table2);
|
evas_object_show(wd->o_table2);
|
||||||
evas_object_show(wd->o_table);
|
evas_object_show(wd->o_table);
|
||||||
|
wd->nochange = EINA_TRUE;
|
||||||
if (!selected) e_fm2_first_sel(wd->o_files_fm);
|
if (!selected) e_fm2_first_sel(wd->o_files_fm);
|
||||||
|
wd->nochange = EINA_FALSE;
|
||||||
evas_object_focus_set(wd->o_files_fm, EINA_TRUE);
|
evas_object_focus_set(wd->o_files_fm, EINA_TRUE);
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue