fix: ensure update_overlay function is called after every event type

hugemenace · Jan 28, 2022 · c5d59b0 · c5d59b0
1 parent c7e4d2c
commit c5d59b0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 32 deletions.
diff --git a/blank_sketch.py b/blank_sketch.py
@@ -12,12 +12,8 @@ class ND_OT_blank_sketch(bpy.types.Operator):
 
 
     def modal(self, context, event):
-        if not self.pin_overlay and event.type == 'MOUSEMOVE':
-            update_overlay(self, context, event)
-
-        elif event.type == 'P' and event.value == 'PRESS':
+        if event.type == 'P' and event.value == 'PRESS':
             self.pin_overlay = not self.pin_overlay
-            update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=280, lines=1)
 
         elif event.type == 'SPACE':
             self.finish(context)
@@ -41,6 +37,8 @@ def modal(self, context, event):
         elif event.type == 'MIDDLEMOUSE' or (event.alt and event.type in {'LEFTMOUSE', 'RIGHTMOUSE'}) or event.type.startswith('NDOF'):
             return {'PASS_THROUGH'}
 
+        update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=280, lines=1)
+
         return {'RUNNING_MODAL'}
 
 

diff --git a/bolt.py b/bolt.py
@@ -22,12 +22,8 @@ def modal(self, context, event):
         self.key_alt = event.alt
         self.key_ctrl = event.ctrl
 
-        if not self.pin_overlay and event.type == 'MOUSEMOVE':
-            update_overlay(self, context, event)
-
-        elif event.type == 'P' and event.value == 'PRESS':
+        if event.type == 'P' and event.value == 'PRESS':
             self.pin_overlay = not self.pin_overlay
-            update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=375, lines=4)
 
         elif event.type in {'PLUS', 'EQUAL', 'NUMPAD_PLUS'} and event.value == 'PRESS':
             if event.alt and event.ctrl:
@@ -77,8 +73,9 @@ def modal(self, context, event):
 
         elif event.type == 'MIDDLEMOUSE' or (event.alt and event.type in {'LEFTMOUSE', 'RIGHTMOUSE'}) or event.type.startswith('NDOF'):
             return {'PASS_THROUGH'}
-
+        
         self.operate(context)
+        update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=375, lines=4)
 
         return {'RUNNING_MODAL'}
 

diff --git a/screw.py b/screw.py
@@ -20,12 +20,8 @@ def modal(self, context, event):
         self.key_alt = event.alt
         self.key_ctrl = event.ctrl
 
-        if not self.pin_overlay and event.type == 'MOUSEMOVE':
-            update_overlay(self, context, event)
-
-        elif event.type == 'P' and event.value == 'PRESS':
+        if event.type == 'P' and event.value == 'PRESS':
             self.pin_overlay = not self.pin_overlay
-            update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=360, lines=4)
 
         elif event.type in {'PLUS', 'EQUAL', 'NUMPAD_PLUS'} and event.value == 'PRESS':
             if event.alt and event.ctrl:
@@ -47,7 +43,6 @@ def modal(self, context, event):
                 self.angle = min(360, self.angle + angle_factor)
             else:
                 self.segments = 4 if self.segments == 3 else self.segments + segment_factor
-
 
         elif event.type == 'WHEELDOWNMOUSE':
             if event.alt and event.ctrl:
@@ -76,6 +71,7 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
+        update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=360, lines=4)
 
         return {'RUNNING_MODAL'}
 

diff --git a/solidify.py b/solidify.py
@@ -17,12 +17,8 @@ def modal(self, context, event):
         self.key_shift = event.shift
         self.key_alt = event.alt
 
-        if not self.pin_overlay and event.type == 'MOUSEMOVE':
-            update_overlay(self, context, event)
-
-        elif event.type == 'P' and event.value == 'PRESS':
+        if event.type == 'P' and event.value == 'PRESS':
             self.pin_overlay = not self.pin_overlay
-            update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=260, lines=2)
 
         elif event.type in {'PLUS', 'EQUAL', 'NUMPAD_PLUS'} and event.value == 'PRESS':
             self.base_thickness_factor = min(1, self.base_thickness_factor * 10.0)
@@ -56,6 +52,7 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
+        update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=260, lines=2)
 
         return {'RUNNING_MODAL'}
 

diff --git a/vertex_bevel.py b/vertex_bevel.py
@@ -17,12 +17,8 @@ def modal(self, context, event):
         self.key_shift = event.shift
         self.key_alt = event.alt
 
-        if not self.pin_overlay and event.type == 'MOUSEMOVE':
-            update_overlay(self, context, event)
-
-        elif event.type == 'P' and event.value == 'PRESS':
+        if event.type == 'P' and event.value == 'PRESS':
             self.pin_overlay = not self.pin_overlay
-            update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=300, lines=2)
 
         elif event.type in {'PLUS', 'EQUAL', 'NUMPAD_PLUS'} and event.value == 'PRESS':
             self.base_width_factor = min(1, self.base_width_factor * 10.0)
@@ -56,6 +52,7 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
+        update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=300, lines=2)
 
         return {'RUNNING_MODAL'}
 

diff --git a/weighted_normal_bevel.py b/weighted_normal_bevel.py
@@ -16,12 +16,8 @@ def modal(self, context, event):
 
         self.key_shift = event.shift
 
-        if not self.pin_overlay and event.type == 'MOUSEMOVE':
-            update_overlay(self, context, event)
-
-        elif event.type == 'P' and event.value == 'PRESS':
+        if event.type == 'P' and event.value == 'PRESS':
             self.pin_overlay = not self.pin_overlay
-            update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=270, lines=1)
 
         elif event.type in {'PLUS', 'EQUAL', 'NUMPAD_PLUS'} and event.value == 'PRESS':
             self.base_width_factor = min(1, self.base_width_factor * 10.0)
@@ -49,6 +45,7 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
+        update_overlay(self, context, event, pinned=self.pin_overlay, x_offset=270, lines=1)
 
         return {'RUNNING_MODAL'}