Merge branch 'master' into next
This commit is contained in:
commit
0279401528
3
src/x.c
3
src/x.c
|
@ -1140,8 +1140,7 @@ void x_set_i3_atoms(void) {
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void x_set_warp_to(Rect *rect) {
|
void x_set_warp_to(Rect *rect) {
|
||||||
if (!config.disable_focus_follows_mouse &&
|
if (config.mouse_warping != POINTER_WARPING_NONE)
|
||||||
config.mouse_warping != POINTER_WARPING_NONE)
|
|
||||||
warp_to = rect;
|
warp_to = rect;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue