merged changes from pre-devel

1 files changed, 5 insertions, 3 deletions

diff --git a/src/ScreenPlacement.hh b/src/ScreenPlacement.hh
index be007eb..79d6c21 100644
--- a/src/ScreenPlacement.hh
+++ b/src/ScreenPlacement.hh
@@ -43,8 +43,10 @@ class ScreenPlacement: public PlacementStrategy {
 public:
     enum PlacementPolicy { 
         ROWSMARTPLACEMENT, 
-        COLSMARTPLACEMENT,                            
-        CASCADEPLACEMENT, 
+        COLSMARTPLACEMENT,
+        COLMINOVERLAPPLACEMENT,
+        ROWMINOVERLAPPLACEMENT,
+        CASCADEPLACEMENT,
         UNDERMOUSEPLACEMENT
     };
 
@@ -62,7 +64,7 @@ public:
     virtual ~ScreenPlacement() {}
     /// placeWindow is guaranteed to succeed, ignore return value
     /// @return true
-    bool placeWindow(const std::vector<FluxboxWindow *> &windowlist,
+    bool placeWindow(const std::list<FluxboxWindow *> &windowlist,
                      const FluxboxWindow &window,
                      int &place_x, int &place_y);