#include "Toolbar.h"
#include "Window.h"
#include "Workspace.h"
+
#include "Windowmenu.h"
#include "Geometry.h"
#include "Util.h"
spaces = calcSpace(*cur, spaces);
//Find first space that fits the window
- best = 0;
+ best = NULL;
for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
if ((siter->w() >= win_size.w()) &&
(siter->h() >= win_size.h()))
best = siter;
}
- if (best != 0)
+ if (best != NULL)
return new Point(best->origin());
else
- return new Point(200, 0);
+ return NULL; //fall back to cascade
}
inline Point *Workspace::rowSmartPlacement(const Size &win_size,
LinkedListIterator<OpenboxWindow> it(windowList);
test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ?
- start_pos : screen.getHeight() - win_size.h() - start_pos;
+ start_pos : screen.size().h() - win_size.h() - start_pos;
while(!placed &&
((screen.getColPlacementDirection() == BScreen::BottomTop) ?
const int win_w = win->size().w() + (screen.getBorderWidth() * 4),
win_h = win->size().h() + (screen.getBorderWidth() * 4),
#ifdef SLIT
- slit_x = screen.getSlit()->getX() - screen.getBorderWidth(),
- slit_y = screen.getSlit()->getY() - screen.getBorderWidth(),
- slit_w = screen.getSlit()->getWidth() +
+ slit_x = screen.getSlit()->area().x() - screen.getBorderWidth(),
+ slit_y = screen.getSlit()->area().y() - screen.getBorderWidth(),
+ slit_w = screen.getSlit()->area().w() +
(screen.getBorderWidth() * 4),
- slit_h = screen.getSlit()->getHeight() +
+ slit_h = screen.getSlit()->area().h() +
(screen.getBorderWidth() * 4),
#endif // SLIT
toolbar_x = screen.getToolbar()->getX() - screen.getBorderWidth(),
LinkedListIterator<OpenboxWindow> it(windowList);
Rect space(0, 0,
- screen.getWidth(),
- screen.getHeight()
+ screen.size().w(),
+ screen.size().h()
);
Size window_size(win_w, win_h);
place_y=spot->y();
delete spot;
placed=true;
- }
+ }else
+ placed=false;
+
break;
}
case BScreen::RowSmartPlacement: {
case BScreen::ColSmartPlacement: {
test_x = (screen.getRowPlacementDirection() == BScreen::LeftRight) ?
- start_pos : screen.getWidth() - win_w - start_pos;
+ start_pos : screen.size().w() - win_w - start_pos;
while (!placed &&
((screen.getRowPlacementDirection() == BScreen::RightLeft) ?
- test_x > 0 : test_x + win_w < (signed) screen.getWidth())) {
+ test_x > 0 : test_x + win_w < (signed) screen.size().w())) {
test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ?
- start_pos : screen.getHeight() - win_h - start_pos;
+ start_pos : screen.size().h() - win_h - start_pos;
while (!placed &&
((screen.getColPlacementDirection() == BScreen::BottomTop) ?
- test_y > 0 : test_y + win_h < (signed) screen.getHeight())) {
+ test_y > 0 : test_y + win_h < (signed) screen.size().h())) {
placed = True;
it.reset();
} // switch
if (! placed) {
- if (((unsigned) cascade_x > (screen.getWidth() / 2)) ||
- ((unsigned) cascade_y > (screen.getHeight() / 2)))
- cascade_x = cascade_y = 32;
-
- place_x = cascade_x;
- place_y = cascade_y;
-
- cascade_x += win->getTitleHeight();
- cascade_y += win->getTitleHeight();
+ Point *p = cascade(win);
+ place_x=p->x();
+ place_y=p->y();
+ delete p;
}
- if (place_x + win_w > (signed) screen.getWidth())
- place_x = (((signed) screen.getWidth()) - win_w) / 2;
- if (place_y + win_h > (signed) screen.getHeight())
- place_y = (((signed) screen.getHeight()) - win_h) / 2;
+ if (place_x + win_w > (signed) screen.size().w())
+ place_x = (((signed) screen.size().w()) - win_w) / 2;
+ if (place_y + win_h > (signed) screen.size().h())
+ place_y = (((signed) screen.size().h()) - win_h) / 2;
win->configure(place_x, place_y, win->size().w(), win->size().h());
}
+
+Point *Workspace::cascade(const OpenboxWindow *const win){
+ if (((unsigned) cascade_x > (screen.size().w() / 2)) ||
+ ((unsigned) cascade_y > (screen.size().h() / 2)))
+ cascade_x = cascade_y = 32;
+
+ cascade_x += win->getTitleHeight();
+ cascade_y += win->getTitleHeight();
+
+ return new Point(cascade_x, cascade_y);
+}