resizing works and whatnot

[chaz/openbox] / src / workspace.cc

diff --git a/src/workspace.cc b/src/workspace.cc
index 42edf0a6e4fc4faf4609aaaaa47d4aaa8c086174..467d868400feda0670af4ed9f1c3897c3147e286 100644 (file)
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -27,8 +27,8 @@ using std::string;
 #include "blackbox.hh"
 #include "otk/font.hh"
 #include "otk/display.hh"
-#include "screen.hh"
-#include "util.hh"
+#include "bbscreen.hh"
+#include "otk/util.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"
 
@@ -605,8 +605,8 @@ bool Workspace::smartPlacement(otk::Rect& win) {
     }
 
     tmp.setRect(curr->frameRect().x(), curr->frameRect().y(),
-                curr->frameRect().width() + screen->getBorderWidth(),
-                curr->frameRect().height() + screen->getBorderWidth());
+                curr->frameRect().width() + screen->getWindowStyle()->getBorderWidth(),
+                curr->frameRect().height() + screen->getWindowStyle()->getBorderWidth());
 
     spaces = calcSpace(tmp, spaces);
   }
@@ -765,7 +765,7 @@ void Workspace::placeWindow(BlackboxWindow *win) {
 
   if (placed == False)
     cascadePlacement(new_win, (win->getTitleHeight() +
-                               screen->getBorderWidth() * 2));
+                               screen->getWindowStyle()->getBorderWidth() * 2));
 
   if (new_win.right() > screen->availableArea().right())
     new_win.setX(screen->availableArea().left());