From: <no-...@en...> - 2008-08-26 02:21:55
|
Author: raster Date: 2008-08-25 19:21:51 -0700 (Mon, 25 Aug 2008) New Revision: 35673 Modified: trunk/e/src/bin/e_border.c trunk/illume/src/e_mod_layout.c Log: 1. set focuse on activate in illume 2. fix focus set when not visible Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-08-25 19:10:07 UTC (rev 35672) +++ trunk/e/src/bin/e_border.c 2008-08-26 02:21:51 UTC (rev 35673) @@ -391,12 +391,10 @@ } else if (atoms[i] == ECORE_X_ATOM_NET_WM_STRUT) { - printf("ECORE_X_ATOM_NET_WM_STRUT\n"); bd->client.netwm.fetch.strut = 1; } else if (atoms[i] == ECORE_X_ATOM_NET_WM_STRUT_PARTIAL) { - printf("ECORE_X_ATOM_NET_WM_STRUT_PARTIAL\n"); bd->client.netwm.fetch.strut = 1; } else if (atoms[i] == ECORE_X_ATOM_NET_WM_WINDOW_TYPE) @@ -1392,7 +1390,9 @@ e_border_focus_set(bd, 1, 1); } else if (e_config->focus_policy == E_FOCUS_CLICK) - e_border_focus_set(bd, 1, 1); + { + e_border_focus_set(bd, 1, 1); + } else if (!e_border_pointer_warp_to_center(bd)) e_border_focus_set(bd, 1, 1); @@ -1484,12 +1484,12 @@ return; } // if (bd->visible) - { - if (focus_track_frozen == 0) - { +// { +// if (focus_track_frozen == 0) +// { //// e_border_focus_latest_set(bd); - } - } +// } +// } // printf("EMIT 0x%x activeve\n", bd->client.win); e_border_focus_latest_set(bd); edje_object_signal_emit(bd->bg_object, "e,state,focused", "e"); @@ -1513,9 +1513,6 @@ bd->raise_timer = NULL; } } - if (bd->want_focus) - { - } if (((bd->focused) && (!focus)) || ((!bd->focused) && (focus))) focus_changed = 1; bd->focused = focus; @@ -6917,8 +6914,11 @@ if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus)) { + bd->want_focus = 0; if (!bd->lock_focus_out) - e_border_focus_set_with_pointer(bd); + { + e_border_focus_set_with_pointer(bd); + } } else { @@ -6934,7 +6934,6 @@ } } } - bd->want_focus = 0; } if (bd->need_maximize) Modified: trunk/illume/src/e_mod_layout.c =================================================================== --- trunk/illume/src/e_mod_layout.c 2008-08-25 19:10:07 UTC (rev 35672) +++ trunk/illume/src/e_mod_layout.c 2008-08-26 02:21:51 UTC (rev 35673) @@ -179,6 +179,7 @@ e_border_uniconify(bd); e_border_show(bd); e_border_raise(bd); + e_border_focus_set(bd, 1, 1); } void |