summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-05-11 13:32:52 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-05-11 13:32:52 -0400
commit89deb898ad3e7a7f075071378af27a290d3753cb (patch)
treea7b7971ff08f7810fc3c6dfb42e97d7ed18f87a2
parent280a29cc95b832b167fa46862f6a79c2dfc358a3 (diff)
change efm icon entry to only toggle focus in x11 compositors (runtime)
-rw-r--r--src/bin/e_fm.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 08f2905d8..c748c4753 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -10417,9 +10417,8 @@ _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic)
10417 ic->entry_widget = e_widget_entry_add(e_win_evas_win_get(e), NULL, NULL, NULL, NULL); 10417 ic->entry_widget = e_widget_entry_add(e_win_evas_win_get(e), NULL, NULL, NULL, NULL);
10418 evas_object_event_callback_add(ic->entry_widget, EVAS_CALLBACK_KEY_DOWN, 10418 evas_object_event_callback_add(ic->entry_widget, EVAS_CALLBACK_KEY_DOWN,
10419 _e_fm2_icon_entry_widget_cb_key_down, ic); 10419 _e_fm2_icon_entry_widget_cb_key_down, ic);
10420#ifndef HAVE_WAYLAND_ONLY 10420 if (e_comp->comp_type == E_PIXMAP_TYPE_X)
10421 evas_event_feed_mouse_out(evas_object_evas_get(ic->obj), ecore_x_current_time_get(), NULL); 10421 evas_event_feed_mouse_out(evas_object_evas_get(ic->obj), 0, NULL);
10422#endif
10423 if (e_comp->evas == e) 10422 if (e_comp->evas == e)
10424 e_comp_grab_input(0, 1); 10423 e_comp_grab_input(0, 1);
10425 ic->keygrab = (e_comp->evas == e); 10424 ic->keygrab = (e_comp->evas == e);
@@ -10432,9 +10431,8 @@ _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic)
10432 e_widget_entry_select_all(ic->entry_widget); 10431 e_widget_entry_select_all(ic->entry_widget);
10433 ic->sd->iop_icon = ic; 10432 ic->sd->iop_icon = ic;
10434 ic->sd->typebuf.disabled = EINA_TRUE; 10433 ic->sd->typebuf.disabled = EINA_TRUE;
10435#ifndef HAVE_WAYLAND_ONLY 10434 if (e_comp->comp_type == E_PIXMAP_TYPE_X)
10436 evas_event_feed_mouse_in(e, ecore_x_current_time_get(), NULL); 10435 evas_event_feed_mouse_in(e, 0, NULL);
10437#endif
10438 return ic->entry_widget; 10436 return ic->entry_widget;
10439} 10437}
10440 10438