X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FSlit.cc;h=e20c9b6ec9082b8d2729810bfdf9c10e6f7da488;hb=3f6f897d88d820a7a7e8b388aff12c8d56f96fa4;hp=0e7b7c8115667b4e1b11d90ab63a11c7439f958c;hpb=18499a6920309d6ddfe70767f8a90e2778a96ba7;p=chaz%2Fopenbox diff --git a/src/Slit.cc b/src/Slit.cc index 0e7b7c81..e20c9b6e 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -559,13 +559,13 @@ void Slit::reposition(void) { Toolbar *tbar = screen.getToolbar(); int sw = frame.area.w() + (screen.getBorderWidth() * 2), sh = frame.area.h() + (screen.getBorderWidth() * 2), - tw = tbar->getWidth() + screen.getBorderWidth(), - th = tbar->getHeight() + screen.getBorderWidth(); + tw = tbar->area().w() + screen.getBorderWidth(), + th = tbar->area().h() + screen.getBorderWidth(); - if (tbar->getX() < frame.area.x() + sw && - tbar->getX() + tw > frame.area.x() && - tbar->getY() < frame.area.y() + sh && - tbar->getY() + th > frame.area.y()) { + if (tbar->area().x() < frame.area.x() + sw && + tbar->area().x() + tw > frame.area.x() && + tbar->area().y() < frame.area.y() + sh && + tbar->area().y() + th > frame.area.y()) { if (frame.area.y() < th) { frame.area.setY(frame.area.y() + tbar->getExposedHeight()); if (m_direction == Vertical)