include the desktop name if cycling on all desktops is enabled

[chaz/openbox] / scripts / motion.py

diff --git a/scripts/motion.py b/scripts/motion.py
index 649f07ba41996734956b50dcd9d68495eb3a9a40..e0a1d3522fbe6c3e1cb9f55136157f1e272e79fc 100644 (file)
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -106,7 +106,7 @@ def _do_move():
         w = _client.area().width() + fs.left + fs.right
         h = _client.area().height() + fs.top + fs.bottom
         # use the area based on the struts
-        area = ob.openbox.screen(_screen).area()
+        area = ob.openbox.screen(_screen).area(_client.desktop())
         l = area.left()
         r = area.right() - w + 1
         t = area.top()
@@ -149,9 +149,9 @@ def _do_move():
         _poplabel.setText(text)
         scsize = otk.display.screenInfo(_screen).size()
         size = _poplabel.minSize()
-        _popwidget.resize(_poplabel.minSize())
-        _popwidget.move(otk.Point((scsize.width() - size.width()) / 2,
-                                  (scsize.height() - size.height()) / 2))
+        _popwidget.moveresize(otk.Rect((scsize.width() - size.width()) / 2,
+                                       (scsize.height() - size.height()) / 2,
+                                       size.width(), size.height()))
         _popwidget.show(1)
 
 def _move(data):
@@ -214,8 +214,6 @@ def _do_resize():
 
     w = _cw + dx
     h = _ch + dy
-    if w < 0: w = 0
-    if h < 0: h = 0
 
     if RESIZE_RUBBERBAND:
         # draw the outline ...
@@ -235,9 +233,9 @@ def _do_resize():
         _poplabel.setText(text)
         scsize = otk.display.screenInfo(_screen).size()
         size = _poplabel.minSize()
-        _popwidget.resize(_poplabel.minSize())
-        _popwidget.move(otk.Point((scsize.width() - size.width()) / 2,
-                                  (scsize.height() - size.height()) / 2))
+        _popwidget.moveresize(otk.Rect((scsize.width() - size.width()) / 2,
+                                       (scsize.height() - size.height()) / 2,
+                                       size.width(), size.height()))
         _popwidget.show(1)
 
 def _resize(data):