#184 Make discrete processing a general mode property instead of just…

… an absolute mode because it doesn't just affect absolute processing but target value interpretation in general (percentages vs. discrete values)
helgoboss · May 23, 2021 · 8a74240 · 8a74240
1 parent 68d62c3
commit 8a74240
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/main/lib/helgoboss-learn b/main/lib/helgoboss-learn
diff --git a/main/src/application/mapping_model.rs b/main/src/application/mapping_model.rs
@@ -218,6 +218,8 @@ impl MappingModel {
     pub fn base_mode_applicability_check_input(&self) -> ModeApplicabilityCheckInput {
         ModeApplicabilityCheckInput {
             target_is_virtual: self.target_model.is_virtual(),
+            // TODO-high discrete
+            target_supports_discrete_values: false,
             is_feedback: false,
             make_absolute: self.mode_model.make_absolute.get(),
             // Any is okay, will be overwritten.
@@ -325,7 +327,7 @@ impl<'a> MappingModelWithContext<'a> {
             Normal(MomentaryButton) | Normal(ToggleButton) => {
                 let target = self.target_with_context().resolve_first()?;
                 match mode_type {
-                    AbsoluteMode::Normal | AbsoluteMode::Discrete | AbsoluteMode::ToggleButtons => {
+                    AbsoluteMode::Normal | AbsoluteMode::ToggleButtons => {
                         !target.control_type().is_relative()
                     }
                     AbsoluteMode::IncrementalButtons => {

diff --git a/main/src/application/mode_model.rs b/main/src/application/mode_model.rs
@@ -323,6 +323,8 @@ impl ModeModel {
             discrete_current_absolute_value: 0,
             previous_absolute_control_value: None,
             discrete_previous_absolute_control_value: None,
+            // TODO-high discrete
+            use_discrete_processing: false,
         }
     }
 }

diff --git a/main/src/infrastructure/ui/mapping_panel.rs b/main/src/infrastructure/ui/mapping_panel.rs
@@ -2228,6 +2228,8 @@ impl<'a> ImmutableMappingPanel<'a> {
     ) -> (Option<&str>, Option<&str>) {
         let base_input = ModeApplicabilityCheckInput {
             target_is_virtual: self.mapping.target_model.is_virtual(),
+            // TODO-high discrete
+            target_supports_discrete_values: false,
             is_feedback: false,
             make_absolute: self.mapping.mode_model.make_absolute.get(),
             source_character,