all repos — openbox @ c15287a8225aeda9c509a57561a9bcb420e0c983

openbox fork - make it a bit more like ryudo

menu was off-by-one when no xinerama support was built in
Dana Jansens danakj@orodu.net
commit

c15287a8225aeda9c509a57561a9bcb420e0c983

parent

b73ff84f6f49e846d2dbcbf294d48db10fdc314a

1 files changed, 14 insertions(+), 10 deletions(-)

jump to
M src/Configmenu.ccsrc/Configmenu.cc

@@ -74,18 +74,22 @@ }

void Configmenu::setValues(void) { - setItemSelected(3, getScreen()->doImageDither()); - setItemSelected(4, getScreen()->doOpaqueMove()); - setItemSelected(5, getScreen()->doFullMax()); - setItemSelected(6, getScreen()->doFocusNew()); - setItemSelected(7, getScreen()->doFocusLast()); - setItemSelected(8, getScreen()->getWindowToWindowSnap()); + int index = 2; +#ifdef XINERAMA + ++index; +#endif // XINERAMA + setItemSelected(index++, getScreen()->doImageDither()); + setItemSelected(index++, getScreen()->doOpaqueMove()); + setItemSelected(index++, getScreen()->doFullMax()); + setItemSelected(index++, getScreen()->doFocusNew()); + setItemSelected(index++, getScreen()->doFocusLast()); + setItemSelected(index++, getScreen()->getWindowToWindowSnap()); - setItemSelected(9, getScreen()->getWindowCornerSnap()); - setItemEnabled(9, getScreen()->getWindowToWindowSnap()); + setItemSelected(index, getScreen()->getWindowCornerSnap()); + setItemEnabled(index++, getScreen()->getWindowToWindowSnap()); - setItemSelected(10, getScreen()->allowScrollLock()); - setItemSelected(11, getScreen()->doHideToolbar()); + setItemSelected(index++, getScreen()->allowScrollLock()); + setItemSelected(index++, getScreen()->doHideToolbar()); }