support for modal children, both in the focus code and in the raise/lower code

[chaz/openbox] / src / frame.cc

diff --git a/src/frame.cc b/src/frame.cc
index 06b263d8fa783a471d6f89a922bddf4535755567..ab21daffd823ee296e5fa2bb45441a2e5045fb57 100644 (file)
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -344,6 +344,8 @@ void Frame::adjustSize()
 void Frame::adjustPosition()
 {
   int x, y;
+  x = _client->area().x();
+  y = _client->area().y();
   clientGravity(x, y);
   move(x, y);
 }
@@ -450,9 +452,6 @@ void Frame::releaseClient()
 
 void Frame::clientGravity(int &x, int &y)
 {
-  x = _client->area().x();
-  y = _client->area().y();
-
   // horizontal
   switch (_client->gravity()) {
   default:
@@ -509,9 +508,6 @@ void Frame::clientGravity(int &x, int &y)
 
 void Frame::frameGravity(int &x, int &y)
 {
-  x = rect().x();
-  y = rect().y();
-  
   // horizontal
   switch (_client->gravity()) {
   default: