From 37be3ef9249b452b8edec25a441aefff80c2d4b8 Mon Sep 17 00:00:00 2001
From: Marius Nita <marius@cs.pdx.edu>
Date: Wed, 6 Nov 2002 13:57:54 +0000
Subject: omg, fat commit pulled the style crap out of screen, i think the
 reconfigure case needs to be handled still. moved util and config into otk,
 changed everything else accordingly. code compiles and runs

---
 src/workspace.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/workspace.cc')

diff --git a/src/workspace.cc b/src/workspace.cc
index 42edf0a6..2bf9d29a 100644
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -28,7 +28,7 @@ using std::string;
 #include "otk/font.hh"
 #include "otk/display.hh"
 #include "screen.hh"
-#include "util.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());
-- 
cgit v1.2.3