enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e17: remove redundant checks. lock_focus_out is check in e_boder_focus_set* 

SVN revision: 57648
This commit is contained in:
Hannes Janetzek 2011-03-10 02:44:02 +00:00
parent c51acd3708
commit f3b8b6ccb7
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/e_actions.c
View File

@ -1192,8 +1192,7 @@ ACT_FN_GO(window_desk_move_by, )
e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
/* send the border to the required desktop. */
e_border_desk_set(bd, desk);
if (!bd->lock_focus_out)
e_border_focus_set(bd, 1, 1);
e_border_focus_set(bd, 1, 1);
}
}
}

8
src/bin/e_border.c
View File

@ -7487,10 +7487,7 @@ _e_border_eval(E_Border *bd)
(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 if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
{
@ -7499,8 +7496,7 @@ _e_border_eval(E_Border *bd)
(e_border_find_by_client_window(bd->client.icccm.transient_for) ==
e_border_focused_get())))
{
if (!bd->lock_focus_out)
e_border_focus_set_with_pointer(bd);
e_border_focus_set_with_pointer(bd);
}
}
else

19
src/bin/e_focus.c
View File

@ -30,11 +30,7 @@ e_focus_event_mouse_in(E_Border* bd)
if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
(e_config->focus_policy == E_FOCUS_SLOPPY))
{
if (!bd->lock_focus_out)
{
//if (!bd->focused)
e_border_focus_set(bd, 1, 1);
}
e_border_focus_set(bd, 1, 1);
}
if (bd->raise_timer) ecore_timer_del(bd->raise_timer);
bd->raise_timer = NULL;
@ -85,11 +81,8 @@ e_focus_event_mouse_down(E_Border* bd)
{
if (e_config->focus_policy == E_FOCUS_CLICK)
{
if (!bd->lock_focus_out)
{
if (!bd->focused)
e_border_focus_set(bd, 1, 1);
}
e_border_focus_set(bd, 1, 1);
if (!bd->lock_user_stacking)
{
if (e_config->border_raise_on_focus)
@ -106,11 +99,7 @@ e_focus_event_mouse_down(E_Border* bd)
}
else if (e_config->always_click_to_focus)
{
if (!bd->lock_focus_out)
{
if (!bd->focused)
e_border_focus_set(bd, 1, 1);
}
e_border_focus_set(bd, 1, 1);
}
}