head specific strut, patch from Mathieu De Zutter

1 files changed, 11 insertions, 12 deletions

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index d35e872..19e85db 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.153 2004/09/11 13:33:07 fluxgen Exp $
+// $Id: Toolbar.cc,v 1.154 2004/09/11 13:34:01 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -488,17 +488,16 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
 
         int head = screen().getHead(be.x_root, be.y_root);
         int borderw = menu().fbwindow().borderWidth();
-        pair<int, int> m = screen().clampToHead( head,
-                be.x_root - (menu().width() / 2), 
-                be.y_root - (menu().titleWindow().height() / 2),
-                menu().width() + 2*borderw,
-                menu().height() + 2*borderw);
-
-        menu().setScreen(
-                screen().getHeadX(head),
-                screen().getHeadY(head),
-                screen().getHeadWidth(head),
-                screen().getHeadHeight(head));
+        pair<int, int> m = screen().clampToHead(head,
+                                                be.x_root - (menu().width() / 2), 
+                                                be.y_root - (menu().titleWindow().height() / 2),
+                                                menu().width() + 2*borderw,
+                                                menu().height() + 2*borderw);
+
+        menu().setScreen(screen().getHeadX(head),
+                         screen().getHeadY(head),
+                         screen().getHeadWidth(head),
+                         screen().getHeadHeight(head));
         menu().move(m.first, m.second);
         menu().show();
         menu().grabInputFocus();