Same property getter now checks if values actually the same

Author: MaxBQb

tests/test.py

@@ -238,9 +238,11 @@ def test_effects(self):
         self.assertEqual(self.magnifier.source.raw, self.window.current_rectangle)
         with self.magnifier.source.batch() as source:
             source.same = -1
+            self.assertEqual(source.same, -1)
             source.start_same = 0
+            self.assertEqual(source.start_same, 0)
             source.end_same = 8
-            self.assertEqual(source.same, source.start_same)
+            self.assertEqual(source.same, None)
             self.assertEqual(source.right, source.end_same)
             self.assertEqual((0, 0), source.start)
             self.assertEqual((8, 8), source.end)

win_magnification/_object_utils.py

@@ -364,3 +364,10 @@ def raw(self):
     def reset(self):
         """Resets value of wrapped field to :attr:`.default`"""
         del self.raw
+
+
+def ensure_same(*values: T) -> typing.Optional[T]:
+    pattern = values[0]
+    if all(value == pattern for value in values):
+        return pattern
+    return None

win_magnification/_objects.py

@@ -62,12 +62,17 @@ def __init__(
         super().__init__(datasource)
 
     @property
-    def same(self) -> float:
+    def same(self) -> typing.Optional[float]:
         """
         | Get/set same value from/to (x, y)
+        | Or None if values differs
         | |Accessors: Get Set|
         """
-        return self.x
+        with self.batch():
+            return _utils.ensure_same(
+                self.x,
+                self.y,
+            )
 
     @same.setter
     def same(self, value: float):
@@ -130,12 +135,17 @@ def __init__(
         super().__init__(datasource)
 
     @property
-    def same(self) -> int:
+    def same(self) -> typing.Optional[int]:
         """
         | Get/set same value from/to (x, y)
+        | Or None if values differs
         | |Accessors: Get Set|
         """
-        return self.x
+        with self.batch():
+            return _utils.ensure_same(
+                self.x,
+                self.y,
+            )
 
     @same.setter
     def same(self, value: int):
@@ -207,12 +217,17 @@ def start(self, value: typing.Tuple[int, int]):
             self.left, self.top = value
 
     @property
-    def start_same(self) -> int:
+    def start_same(self) -> typing.Optional[int]:
         """
         | Get/set same value from/to (left, top)
+        | Or None if values differs
         | |Accessors: Get Set|
         """
-        return self.left
+        with self.batch():
+            return _utils.ensure_same(
+                self.left,
+                self.top,
+            )
 
     @start_same.setter
     def start_same(self, value: int):
@@ -232,24 +247,36 @@ def end(self, value: typing.Tuple[int, int]):
             self.right, self.bottom = value
 
     @property
-    def end_same(self) -> int:
+    def end_same(self) -> typing.Optional[int]:
         """
         | Get/set same value from/to (right, bottom)
+        | Or None if values differs
         | |Accessors: Get Set|
         """
-        return self.right
+        with self.batch():
+            return _utils.ensure_same(
+                self.right,
+                self.bottom,
+            )
 
     @end_same.setter
     def end_same(self, value: int):
         self.end = value, value
 
     @property
-    def same(self) -> int:
+    def same(self) -> typing.Optional[int]:
         """
         | Get/set same value from/to (left, top, right, bottom)
+        | Or None if values differs
         | |Accessors: Get Set|
         """
-        return self.left
+        with self.batch():
+            return _utils.ensure_same(
+                self.left,
+                self.top,
+                self.right,
+                self.bottom,
+            )
 
     @same.setter
     def same(self, value: int):