X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fmotion.py;h=845476780424ae74c2edde1f70887e7e2bc29f7c;hb=e1e5293ae354ab7b1c8459aab85e60e1a801924d;hp=e8aa1f3e97143d3d993d7e784f9a0f4701d38806;hpb=f7a0eb7624fa323a37f9fb0e306d7e1bbc745e15;p=chaz%2Fopenbox

diff --git a/scripts/motion.py b/scripts/motion.py
index e8aa1f3e..84547678 100644
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -1,6 +1,6 @@
 ############################################################################
-### Functions that provide callbacks for motion events to move and       ###
-### windows.                                                             ###
+###    Functions that provide callbacks for motion events to move and    ###
+###    resize windows.                                                   ###
 ############################################################################
 
 #############################################################################
@@ -28,6 +28,20 @@ resize_rubberband = 0                                                     ###
 ###                is, 0 to resize always from the bottom right corner.   ###
 resize_nearest = 1                                                        ###
 ###                                                                       ###
+###                                                                       ###
+# Provides:                                                               ###
+# def move(data):                                                         ###
+#     """Moves the window interactively. This should only be used with    ###
+#        MouseMotion events. If move_popup or move_rubberband is enabled, ###
+#        then the end_move function needs to be bound as well."""         ###
+# def end_move(data):                                                     ###
+#     """Complete the interactive move of a window."""                    ###
+# def resize(data):                                                       ###
+#     """Resizes the window interactively. This should only be used with  ###
+#        MouseMotion events"""                                            ###
+# def end_resize(data):                                                   ###
+#     """Complete the interactive resize of a window."""                  ###
+###                                                                       ###
 #############################################################################
 
 import ob
@@ -95,7 +109,7 @@ def _do_move():
             _poplabel = otk.Label(_popwidget)
             _poplabel.setTexture(style.labelFocusBackground())
             _popwidget.show(1)
-        _poplabel.resize(length, font.height())
+        _poplabel.fitString(text)
         _poplabel.setText(text)
         area = otk.display.screenInfo(_screen).rect()
         _popwidget.update() 
@@ -124,7 +138,6 @@ def move(data):
     global _inmove
     if not _inmove:
         ob.kgrab(_screen, _motion_grab)
-        print "GRAB"
         _inmove = 1
 
 def end_move(data):
@@ -139,12 +152,14 @@ def end_move(data):
         _inmove = 0
     _poplabel = 0
     _popwidget = 0
-    print "UNGRAB"
     ob.kungrab()
 
 def _do_resize():
     global _screen, _client, _cx, _cy, _cw, _ch, _px, _py, _dx, _dy
 
+    dx = _dx
+    dy = _dy
+    
     # pick a corner to anchor
     if not (resize_nearest or _context == ob.MouseContext.Grip):
         corner = ob.Client.TopLeft
@@ -154,19 +169,19 @@ def _do_resize():
         if y < _ch / 2:
             if x < _cw / 2:
                 corner = ob.Client.BottomRight
-                _dx *= -1
+                dx *= -1
             else:
                 corner = ob.Client.BottomLeft
-            _dy *= -1
+            dy *= -1
         else:
             if x < _cw / 2:
                 corner = ob.Client.TopRight
-                _dx *= -1
+                dx *= -1
             else:
                 corner = ob.Client.TopLeft
 
-    w = _cw + _dx
-    h = _ch + _dy
+    w = _cw + dx
+    h = _ch + dy
 
     global resize_popup
     if resize_rubberband: