Extend newly added utilities unit tests

- Move widget with binding on parent
- Coordinates in box fixed
- Move widget with binding

Author: dogeek

tests/test_utilities.py

@@ -7,6 +7,9 @@
 
 
 class TestUtilities(BaseWidgetTest):
+    def _dummy_bind(self, event):
+        pass
+    
     def test_move_widget(self):
         label = ttk.Label(self.window)
         tl = tk.Toplevel(self.window)
@@ -41,24 +44,38 @@ def test_move_widget_place(self):
         self.assertIn(label, tl.place_slaves())
 
     def test_move_widget_with_binding(self):
-        raise NotImplementedError
+        label = ttk.Label(self.window)
+        label.bind('<Enter>', self._dummy_bind)
+        label.pack()
+        tl = tk.Toplevel(self.window)
+        label = move_widget(label, tl)
+        label.pack()
+        self.assertTrue(label.winfo_parent() == '.' + tl.winfo_name())
+        self.assertIn('<Enter>', label.bind())
 
     def test_move_widget_with_binding_on_parent(self):
-        raise NotImplementedError
+        self.window.bind('<Enter>', self._dummy_bind)
+        label = ttk.Label(self.window)
+        label.pack()
+        tl = tk.Toplevel(self.window)
+        label = move_widget(label, tl)
+        label.pack()
+        self.assertTrue(label.winfo_parent() == '.' + tl.winfo_name())
+        self.assertIn('<Enter>', tl.bind())
 
     def test_parse_geometry(self):
         g = parse_geometry('1x1+1+1')
         self.assertEqual(g, (1, 1, 1, 1))
         g = parse_geometry('1x1-1-1')
-        self.assertEqual(g, (1, 1, -1, -1))
+        self.assertEqual(g, (-1, -1, 1, 1))
 
     def test_coordinates_in_box(self):
         with self.assertRaises(ValueError):
             coords_in_box((1,), (1, 1, 3, 3))
 
         with self.assertRaises(ValueError):
             coords_in_box((1, 1), (1, 1, 3, 3, 4))
-        
+
         self.assertTrue(coords_in_box((1, 1), (0, 0, 2, 2)))
         self.assertFalse(coords_in_box((1, 1), (1, 1, 2, 2), include_edges=False))
-        self.assertTrue(coords_in_box((0, 0), (-1, -1, 1, 1)))
+        self.assertTrue(coords_in_box((0, 0), (-1, -1, 1, 1), bbox_is_x1y1x2y2=True))

ttkwidgets/utilities.py

@@ -101,7 +101,7 @@ def parse_geometry(geometry):
              int(match.group(1)), int(match.group(2)))
 
 
-def coords_in_box(coords, bbox, include_edges=True):
+def coords_in_box(coords, bbox, include_edges=True, bbox_is_x1y1x2y2=False):
     """
     Checks whether coords are inside bbox
 
@@ -111,6 +111,9 @@ def coords_in_box(coords, bbox, include_edges=True):
     :type bbox: tuple
     :param include_edges: default True whether to include the edges
     :type include_edges: bool
+    :param bbox_is_x1y1x2y2: default False whether the bbox is in 
+                    (x, y, width, height) or (x1, y1, x2, y2) format
+    :type bbox_is_x1y1x2y2: bool
     :returns: whether coords is inside bbox
     :rtype: bool
     :raises: ValueError if length of bbox or coords do not match the specifications
@@ -121,11 +124,13 @@ def coords_in_box(coords, bbox, include_edges=True):
         raise ValueError("Bbox argument is supposed to be of length 4")
 
     x, y = coords
-    xmin, ymin, width, height = bbox
-    xmax, ymax = xmin + width, ymin + height
+    if bbox_is_x1y1x2y2:
+        xmin, ymin, xmax, ymax = bbox
+    else:
+        xmin, ymin, width, height = bbox
+        xmax, ymax = xmin + width, ymin + height
+        
     if include_edges:
-        xmin = max(xmin - 1, 0)
-        xmax += 1
-        ymin = max(ymin - 1, 0)
-        ymax += 1
-    return xmin < x < xmax and ymin < y < ymax
+        return xmin <= x <= xmax and ymin <= y <= ymax
+    else:
+        return xmin < x < xmax and ymin < y < ymax