fix: ensure ESC key does not cancel paused operators

hugemenace · Mar 30, 2022 · 01cfa93 · 01cfa93
1 parent 4d8dc21
commit 01cfa93
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 55 deletions.
diff --git a/generators/ring_and_bolt.py b/generators/ring_and_bolt.py
@@ -33,16 +33,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_increase_factor:
             if self.key_alt:
                 self.base_inner_radius_factor = min(1, self.base_inner_radius_factor * 10.0)

diff --git a/generators/screw_head.py b/generators/screw_head.py
@@ -31,16 +31,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_increase_factor:
             if self.key_alt:
                 self.base_offset_factor = min(1, self.base_offset_factor * 10.0)

diff --git a/power_mods/screw.py b/power_mods/screw.py
@@ -30,16 +30,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_increase_factor:
             if self.key_ctrl_alt:
                 self.base_offset_factor = min(1, self.base_offset_factor * 10.0)

diff --git a/power_mods/solidify.py b/power_mods/solidify.py
@@ -29,16 +29,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_increase_factor:
             if self.key_ctrl:
                 self.base_offset_factor = min(1, self.base_offset_factor * 10.0)

diff --git a/power_mods/vertex_bevel.py b/power_mods/vertex_bevel.py
@@ -29,16 +29,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_increase_factor:
             if self.key_alt:
                 self.base_width_factor = min(1, self.base_width_factor * 10.0)

diff --git a/power_mods/weighted_normal_bevel.py b/power_mods/weighted_normal_bevel.py
@@ -28,16 +28,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_increase_factor:
             self.base_width_factor = min(1, self.base_width_factor * 10.0)
 

diff --git a/sketching/blank_sketch.py b/sketching/blank_sketch.py
@@ -21,16 +21,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_confirm_alternative:
             self.finish(context)
 

diff --git a/sketching/geo_lift.py b/sketching/geo_lift.py
@@ -21,11 +21,6 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.clean_up(context)
-
-            return {'CANCELLED'}
-
         elif self.key_step_up:
             if self.key_alt:
                 self.selection_type = (self.selection_type + 1) % 3
@@ -55,6 +50,11 @@ def modal(self, context, event):
 
         elif self.key_confirm:
             return {'PASS_THROUGH'}
+
+        elif self.key_cancel:
+            self.clean_up(context)
+
+            return {'CANCELLED'}
 
         elif self.key_confirm_alternative:
             return self.finish(context)

diff --git a/sketching/view_align.py b/sketching/view_align.py
@@ -22,16 +22,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.clean_up(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.clean_up(context)
+
+            return {'CANCELLED'}
+
         elif self.key_step_up:
             if self.key_alt:
                 self.selection_type = (self.selection_type + 1) % 3

diff --git a/utils/seams.py b/utils/seams.py
@@ -23,16 +23,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_step_up:
             if self.key_alt:
                 self.commit_auto_smooth = not self.commit_auto_smooth

diff --git a/utils/smooth.py b/utils/smooth.py
@@ -23,16 +23,16 @@ def modal(self, context, event):
         elif self.key_toggle_pin_overlay:
             toggle_pin_overlay(self, event)
 
-        elif self.key_cancel:
-            self.revert(context)
-
-            return {'CANCELLED'}
-
         elif self.operator_passthrough:
             update_overlay(self, context, event)
 
             return {'PASS_THROUGH'}
 
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
         elif self.key_step_up:
             self.angle = min(180, self.angle + angle_factor)