From 01cfa9356c015f5aa7e6b4608c435cd5ca352d91 Mon Sep 17 00:00:00 2001 From: Tristan Strathearn Date: Wed, 30 Mar 2022 21:50:52 +1000 Subject: [PATCH] fix: ensure ESC key does not cancel paused operators --- generators/ring_and_bolt.py | 10 +++++----- generators/screw_head.py | 10 +++++----- power_mods/screw.py | 10 +++++----- power_mods/solidify.py | 10 +++++----- power_mods/vertex_bevel.py | 10 +++++----- power_mods/weighted_normal_bevel.py | 10 +++++----- sketching/blank_sketch.py | 10 +++++----- sketching/geo_lift.py | 10 +++++----- sketching/view_align.py | 10 +++++----- utils/seams.py | 10 +++++----- utils/smooth.py | 10 +++++----- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/generators/ring_and_bolt.py b/generators/ring_and_bolt.py index cf75d2c..8590375 100644 --- 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 index 0b5eae2..a5927a5 100644 --- 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 index c961466..3a3a6ae 100644 --- 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 index c585f9d..b380787 100644 --- 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 index a9320d5..d4d72dd 100644 --- 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 index ac0c452..982722e 100644 --- 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 index 81b9efa..ed0897c 100644 --- 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 index 56c1c42..fe0fc85 100644 --- 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 index b6b9ff9..f2efce8 100644 --- 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 index 28eae36..5fc18e1 100644 --- 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 index 0cefde0..f34b427 100644 --- 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)