code cleanup: moved code from public API to implementation

renamed 'Region' to 'Area' to avoid conflicts with 'Region' from Xlib.

1 files changed, 1 insertions, 43 deletions

diff --git a/src/MinOverlapPlacement.hh b/src/MinOverlapPlacement.hh
index daf49f2..1c741ca 100644
--- a/src/MinOverlapPlacement.hh
+++ b/src/MinOverlapPlacement.hh
@@ -26,54 +26,12 @@
 
 class MinOverlapPlacement: public PlacementStrategy {
 public:
-    MinOverlapPlacement(ScreenPlacement::PlacementPolicy policy);
+    MinOverlapPlacement() { };
 
     bool placeWindow(const FluxboxWindow &win, int head,
                      int &place_x, int &place_y);
 
 private:
-    class Region {
-    public:
-
-        enum Corner {
-            TOPLEFT,
-            TOPRIGHT,
-            BOTTOMLEFT,
-            BOTTOMRIGHT
-        } corner; // indicates the corner of the window that will be placed
-
-        Region(Corner _corner, int _x, int _y):
-            corner(_corner), x(_x), y(_y) { };
-
-        // do all STL set implementations use this for sorting?
-        bool operator <(const Region &o) const {
-            switch (MinOverlapPlacement::s_policy) {
-                case ScreenPlacement::ROWMINOVERLAPPLACEMENT:
-                    // if we're making rows, y-value is most important
-                    if (y != o.y)
-                        return ((y < o.y) ^ (s_col_dir == ScreenPlacement::BOTTOMTOP));
-                    if (x != o.x)
-                        return ((x < o.x) ^ (s_row_dir == ScreenPlacement::RIGHTLEFT));
-                    return (corner < o.corner);
-                case ScreenPlacement::COLMINOVERLAPPLACEMENT:
-                    // if we're making columns, x-value is most important
-                    if (x != o.x)
-                        return ((x < o.x) ^ (s_row_dir == ScreenPlacement::RIGHTLEFT));
-                    if (y != o.y)
-                        return ((y < o.y) ^ (s_col_dir == ScreenPlacement::BOTTOMTOP));
-                    return (corner < o.corner);
-                default:
-                    return false;
-            }
-        }
-
-        // position where the top left corner of the window will be placed
-        int x, y;
-    };
-
-    static ScreenPlacement::PlacementPolicy s_policy;
-    static ScreenPlacement::RowDirection s_row_dir;
-    static ScreenPlacement::ColumnDirection s_col_dir;
 };
 
 #endif // MINOVERLAPPLACEMENT_HH