forked from enlightenment/enlightenment
parent
61e273d0df
commit
bdd04a90d2
|
@ -2432,10 +2432,7 @@ _e_fm_win_key_down_cb(void *data, int type, void *event)
|
||||||
|
|
||||||
// make this call generic
|
// make this call generic
|
||||||
if (!sd->win) return 1;
|
if (!sd->win) return 1;
|
||||||
// this doesnt work:
|
if (ev->win != sd->win->evas_sub_win) return 1;
|
||||||
//if (ev->win != sd->win->evas_win) return 1;
|
|
||||||
if(ev->win != ecore_evas_software_x11_subwindow_get(sd->win->ecore_evas))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
if (!strcmp(ev->keysymbol, "Up"))
|
if (!strcmp(ev->keysymbol, "Up"))
|
||||||
_e_fm_icon_select_up(sd);
|
_e_fm_icon_select_up(sd);
|
||||||
|
|
|
@ -46,7 +46,7 @@ e_win_new(E_Container *con)
|
||||||
win->engine = e_canvas_engine_decide(e_config->evas_engine_win);
|
win->engine = e_canvas_engine_decide(e_config->evas_engine_win);
|
||||||
win->ecore_evas = e_canvas_new(e_config->evas_engine_win, con->manager->root,
|
win->ecore_evas = e_canvas_new(e_config->evas_engine_win, con->manager->root,
|
||||||
0, 0, 1, 1, 1, 0,
|
0, 0, 1, 1, 1, 0,
|
||||||
&(win->evas_win), NULL);
|
&(win->evas_win), &(win->evas_sub_win));
|
||||||
e_canvas_add(win->ecore_evas);
|
e_canvas_add(win->ecore_evas);
|
||||||
ecore_evas_data_set(win->ecore_evas, "E_Win", win);
|
ecore_evas_data_set(win->ecore_evas, "E_Win", win);
|
||||||
ecore_evas_callback_move_set(win->ecore_evas, _e_win_cb_move);
|
ecore_evas_callback_move_set(win->ecore_evas, _e_win_cb_move);
|
||||||
|
|
|
@ -22,6 +22,7 @@ struct _E_Win
|
||||||
Ecore_Evas *ecore_evas;
|
Ecore_Evas *ecore_evas;
|
||||||
Evas *evas;
|
Evas *evas;
|
||||||
Ecore_X_Window evas_win;
|
Ecore_X_Window evas_win;
|
||||||
|
Ecore_X_Window evas_sub_win;
|
||||||
unsigned char placed : 1;
|
unsigned char placed : 1;
|
||||||
int min_w, min_h, max_w, max_h, base_w, base_h;
|
int min_w, min_h, max_w, max_h, base_w, base_h;
|
||||||
int step_x, step_y;
|
int step_x, step_y;
|
||||||
|
|
Loading…
Reference in New Issue