Optionally don't slide in DeskGotoByEwin()

No actual changes yet.
This commit is contained in:
Kim Woelders 2019-03-03 07:54:24 +01:00
parent 8dcb2d3dfa
commit 84788b993c
5 changed files with 18 additions and 10 deletions

View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2018 Kim Woelders
* Copyright (C) 2004-2019 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1504,13 +1504,21 @@ DeskRestack(Desk * dsk)
}
void
DeskGotoByEwin(EWin * ewin)
DeskGotoByEwin(EWin * ewin, int now)
{
int slide;
if (EoIsSticky(ewin) || EoIsFloating(ewin))
return;
slide = Conf.desks.slidein;
if (now)
Conf.desks.slidein = 0;
DeskGoto(EoGetDesk(ewin));
DeskCurrentGotoArea(ewin->area_x, ewin->area_y);
Conf.desks.slidein = slide;
}
/*

View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2014 Kim Woelders
* Copyright (C) 2004-2019 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -82,7 +82,7 @@ void DeskCurrentGetArea(int *ax, int *ay);
void DeskCurrentGotoArea(int ax, int ay);
void DeskCurrentMoveAreaBy(int ax, int ay);
void DeskGotoByEwin(EWin * ewin);
void DeskGotoByEwin(EWin * ewin, int now);
unsigned int DesksGetNumber(void);
Desk *DesksGetCurrent(void);

View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2018 Kim Woelders
* Copyright (C) 2004-2019 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1375,7 +1375,7 @@ EwinOpActivate(EWin * ewin, int source, int raise)
/* If somehow lost outside desktop, move it to center */
if (!EwinIsOnDesktop(ewin))
ArrangeEwinCentered(ewin);
DeskGotoByEwin(ewin);
DeskGotoByEwin(ewin, 0);
}
if (raise)
EwinOpRaise(ewin, source);

View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2018 Kim Woelders
* Copyright (C) 2004-2019 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -881,7 +881,7 @@ AddToFamily(EWin * ewin, EX_Window xwin, XWindowAttributes * pxwa, int startup)
dsk = EoGetDesk(ewin2);
if (!Mode.wm.startup && Conf.focus.switchfortransientmap &&
!ewin->state.iconified)
DeskGotoByEwin(ewin2);
DeskGotoByEwin(ewin2, 0);
}
}

View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2018 Kim Woelders
* Copyright (C) 2004-2019 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -388,7 +388,7 @@ doFocusToEwin(EWin * ewin, int why)
if (!do_focus)
return;
DeskGotoByEwin(ewin);
DeskGotoByEwin(ewin, 0);
goto check_focus_new;
}