diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:36:06 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:51:38 -0500 |
| commit | 20b8fcfa33feeade5946bc7f3046705da5d164fe (patch) | |
| tree | 5199d13a9f18aa90ce51244c3c3eb6685d7673ab /openbox/actions.c | |
| parent | dc94a241c30484611688a8bfb5515577f017529e (diff) | |
| parent | d11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c
Diffstat (limited to 'openbox/actions.c')
| -rw-r--r-- | openbox/actions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbox/actions.c b/openbox/actions.c index 0db82e01..10bf929a 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -337,9 +337,7 @@ void actions_client_move(ObActionsData *data, gboolean start) else if (config_focus_follow && data->context != OB_FRAME_CONTEXT_CLIENT) { - if (!data->button && data->client && !config_focus_under_mouse) - event_end_ignore_all_enters(ignore_start); - else { + if (data->uact == OB_USER_ACTION_MOUSE_PRESS) { struct _ObClient *c; /* usually this is sorta redundant, but with a press action @@ -354,5 +352,7 @@ void actions_client_move(ObActionsData *data, gboolean start) event_enter_client(c); } } + else if (!data->button && !config_focus_under_mouse) + event_end_ignore_all_enters(ignore_start); } } |