even more fixes for maximizing/placement with hidden slit/toolbar/etc
Dana Jansens danakj@orodu.net
2 files changed,
40 insertions(+),
22 deletions(-)
M
src/Window.cc
→
src/Window.cc
@@ -1564,21 +1564,23 @@ (slit->placement() == Slit::TopLeft ||
slit->placement() == Slit::TopRight)) || slit->placement() == Slit::TopCenter) { // exclude top - if (tbartop) - space.setH(space.h() - slit_y); - else + if (tbartop && slit_y + slit->area().h() < tbarh) { + space.setY(space.y() + tbarh); space.setH(space.h() - tbarh); - space.setY(space.y() + slit_y + slit->area().h() + - screen->getBorderWidth() * 2); - space.setH(space.h() - (slit_y + slit->area().h() + - screen->getBorderWidth() * 2)); + } else { + space.setY(space.y() + (slit_y + slit->area().h() + + screen->getBorderWidth() * 2)); + space.setH(space.h() - (slit_y + slit->area().h() + + screen->getBorderWidth() * 2)); + if (!tbartop) + space.setH(space.h() - tbarh); + } } else if ((slit->direction() == Slit::Vertical && (slit->placement() == Slit::TopRight || slit->placement() == Slit::BottomRight)) || slit->placement() == Slit::CenterRight) { // exclude right - space.setW(space.w() - (screen->size().w() - slit_x + - screen->getBorderWidth() * 2)); + space.setW(space.w() - (screen->size().w() - slit_x)); if (tbartop) space.setY(space.y() + tbarh); space.setH(space.h() - tbarh);@@ -1587,8 +1589,15 @@ (slit->placement() == Slit::BottomLeft ||
slit->placement() == Slit::BottomRight)) || slit->placement() == Slit::BottomCenter) { // exclude bottom - space.setH(space.h() - ((screen->size().h() - slit_y) > tbarh ? - screen->size().h() - slit_y : tbarh)); + if (!tbartop && (screen->size().h() - slit_y) < tbarh) { + space.setH(space.h() - tbarh); + } else { + space.setH(space.h() - (screen->size().h() - slit_y)); + if (tbartop) { + space.setY(space.y() + tbarh); + space.setH(space.h() - tbarh); + } + } } else {// if ((slit->direction() == Slit::Vertical && // (slit->placement() == Slit::TopLeft || // slit->placement() == Slit::BottomLeft)) ||
M
src/Workspace.cc
→
src/Workspace.cc
@@ -572,21 +572,23 @@ (slit->placement() == Slit::TopLeft ||
slit->placement() == Slit::TopRight)) || slit->placement() == Slit::TopCenter) { // exclude top - if (tbartop) - space.setH(space.h() - slit_y); - else + if (tbartop && slit_y + slit->area().h() < tbarh) { + space.setY(space.y() + tbarh); space.setH(space.h() - tbarh); - space.setY(space.y() + slit_y + slit->area().h() + - screen.getBorderWidth() * 2); - space.setH(space.h() - (slit_y + slit->area().h() + - screen.getBorderWidth() * 2)); + } else { + space.setY(space.y() + (slit_y + slit->area().h() + + screen.getBorderWidth() * 2)); + space.setH(space.h() - (slit_y + slit->area().h() + + screen.getBorderWidth() * 2)); + if (!tbartop) + space.setH(space.h() - tbarh); + } } else if ((slit->direction() == Slit::Vertical && (slit->placement() == Slit::TopRight || slit->placement() == Slit::BottomRight)) || slit->placement() == Slit::CenterRight) { // exclude right - space.setW(space.w() - (screen.size().w() - slit_x + - screen.getBorderWidth() * 2)); + space.setW(space.w() - (screen.size().w() - slit_x)); if (tbartop) space.setY(space.y() + tbarh); space.setH(space.h() - tbarh);@@ -595,8 +597,15 @@ (slit->placement() == Slit::BottomLeft ||
slit->placement() == Slit::BottomRight)) || slit->placement() == Slit::BottomCenter) { // exclude bottom - space.setH(space.h() - ((screen.size().h() - slit_y) > tbarh ? - screen.size().h() - slit_y : tbarh)); + if (!tbartop && (screen.size().h() - slit_y) < tbarh) { + space.setH(space.h() - tbarh); + } else { + space.setH(space.h() - (screen.size().h() - slit_y)); + if (tbartop) { + space.setY(space.y() + tbarh); + space.setH(space.h() - tbarh); + } + } } else {// if ((slit->direction() == Slit::Vertical && // (slit->placement() == Slit::TopLeft || // slit->placement() == Slit::BottomLeft)) ||