summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-05-02 04:44:19 +0000
committerDana Jansens <danakj@orodu.net>2002-05-02 04:44:19 +0000
commit445e28af9aeb385f5ec40213ea66b0a32c8a06ed (patch)
tree59db145521321d5d55a2dc67971e3a1562dfc2d9
parentba832151d037225f086c8d7ff1de31f94c50cd09 (diff)
windows at positions x<0 or y<0 are no longer ignored in the placing code
-rw-r--r--src/Geometry.cc8
-rw-r--r--src/Workspace.cc5
2 files changed, 5 insertions, 8 deletions
diff --git a/src/Geometry.cc b/src/Geometry.cc
index db1de406..cdc39474 100644
--- a/src/Geometry.cc
+++ b/src/Geometry.cc
@@ -102,10 +102,10 @@ void Rect::setH(unsigned int h) {
bool Rect::Intersect(const Rect &r) const {
return
- (x() < (r.x()+r.w()) ) &&
- ( (x()+w()) > r.x()) &&
- (y() < (r.y()+r.h()) ) &&
- ( (y()+h()) > r.y());
+ (x() < (r.x()+(signed)r.w()) ) &&
+ ( (x()+(signed)w()) > r.x()) &&
+ (y() < (r.y()+(signed)r.h()) ) &&
+ ( (y()+(signed)h()) > r.y());
}
Rect Rect::Inflate(const unsigned int i) const {
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 38581d5a..a9fbcdb9 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -545,10 +545,7 @@ Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
sort(spaces.begin(),spaces.end(),colLRBT);
else
sort(spaces.begin(),spaces.end(),colRLBT);
- fprintf(stderr,"Spaces after sorting\n");
- for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
- fprintf(stderr,"space(%d,%d)(%d,%d)\n",siter->x(),siter->y(),
- siter->x()+siter->w(),siter->y()+siter->h());
+
//Find first space that fits the window
best = NULL;
for (siter=spaces.begin(); siter!=spaces.end(); ++siter)