add hide holding option

Author: lucasteles

.editorconfig

@@ -11,7 +11,6 @@ insert_final_newline = true
 # XML project files
 [*.{csproj,fsproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
 indent_size = 2
-
 # XML config files
 [*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
 indent_size = 2
@@ -52,36 +51,39 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 
 # Style Definitions
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+dotnet_naming_style.pascal_case_style.required_prefix =
+
 dotnet_naming_style.camel_case_style.capitalization = camel_case
+dotnet_naming_style.camel_case_style.required_prefix =
 
 # constant case preferences
 dotnet_naming_symbols.constant_fields.applicable_kinds = field
 dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
 dotnet_naming_symbols.constant_fields.required_modifiers = const
-
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
 dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
 
 # fields case preferences
-dotnet_naming_symbols.private_field_symbols.applicable_kinds = field
-dotnet_naming_symbols.private_field_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_fields.applicable_kinds = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private
 
-dotnet_naming_rule.private_field_symbols_should_be_camel_case.symbols = private_field_symbols
+dotnet_naming_rule.private_field_symbols_should_be_camel_case.symbols = private_fields
 dotnet_naming_rule.private_field_symbols_should_be_camel_case.severity = warning
 dotnet_naming_rule.private_field_symbols_should_be_camel_case.style = camel_case_style
 
-dotnet_naming_symbols.protected_field_symbols.applicable_kinds = field, property
-dotnet_naming_symbols.protected_field_symbols.applicable_accessibilities = protected
-dotnet_naming_rule.protected_field_symbols_should_be_camel_case.symbols = protected_field_symbols
+
+dotnet_naming_symbols.protected_fields.applicable_kinds = field
+dotnet_naming_symbols.protected_fields.applicable_accessibilities = protected
+
+dotnet_naming_rule.protected_field_symbols_should_be_camel_case.symbols = protected_fields
 dotnet_naming_rule.protected_field_symbols_should_be_camel_case.severity = suggestion
 dotnet_naming_rule.protected_field_symbols_should_be_camel_case.style = camel_case_style
 
 # var preferences
 csharp_style_var_for_built_in_types = true:silent
 csharp_style_var_when_type_is_apparent = true:silent
 csharp_style_var_elsewhere = true:silent
-
 # Expression-bodied members
 csharp_style_expression_bodied_methods = true:suggestion
 csharp_style_expression_bodied_constructors = true:suggestion
@@ -91,24 +93,19 @@ csharp_style_expression_bodied_indexers = true:suggestion
 csharp_style_expression_bodied_accessors = true:suggestion
 csharp_style_expression_bodied_lambdas = true:suggestion
 csharp_style_expression_bodied_local_functions = true:suggestion
-
 # Pattern matching preferences
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-
 # Null-checking preferences
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
-
 # Modifier preferences
 csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async:suggestion
-
 # Expression-level preferences
 csharp_prefer_braces = false
 csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
 csharp_style_inlined_variable_declaration = true:suggestion
-
 # New line preferences
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
@@ -117,12 +114,10 @@ csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
-
 # Indentation preferences
 csharp_indent_case_contents = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
-
 # Space preferences
 csharp_space_after_cast = false
 csharp_space_after_keywords_in_control_flow_statements = true
@@ -138,36 +133,43 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
-
-# Analysers
+# Analyzers
 ## dotnet
 dotnet_diagnostic.IDE0011.severity = suggestion # require braces
 dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary.
-dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary.
-dotnet_diagnostic.CA1860.severity = silent # Prefer comparing 'Length' to 0 rather than using 'Any()'
-
+dotnet_diagnostic.IDE0251.severity = warning # member can be readonly
+dotnet_diagnostic.CA1860.severity = warning # Prefer comparing 'Length' to 0 rather than using 'Any()'
 ## Sonar
 dotnet_diagnostic.S1481.severity = warning # variable never used
 dotnet_diagnostic.S1144.severity = suggestion # Remove the unused private constructor 'AddAuthorizationHeaderOperationFilter'.
 dotnet_diagnostic.S1118.severity = suggestion # Add a 'protected' constructor or the 'static' keyword to the class declaration.
 dotnet_diagnostic.S1075.severity = suggestion # hardcoded URIs
 dotnet_diagnostic.S3459.severity = suggestion # Unassigned members should be removed
-dotnet_diagnostic.S1104.severity = suggestion #  Make this field 'private' and encapsulate it in a 'public' property. 
-dotnet_diagnostic.S3878.severity = suggestion #  params array creation
-dotnet_diagnostic.S3267.severity = suggestion # loops simplified LINQ 
-dotnet_diagnostic.S2681.severity = suggestion # loops single line 
+dotnet_diagnostic.S1210.severity = suggestion # When implementing IComparable , you should also override , =, >, and >=. 
+dotnet_diagnostic.S2344.severity = suggestion # remove Enum suffix
+dotnet_diagnostic.S6603.severity = suggestion
+dotnet_diagnostic.S6602.severity = suggestion # prefer array exists
 dotnet_diagnostic.S3237.severity = silent # Use the 'value' contextual keyword in this property set accessor declaration.
-dotnet_diagnostic.S1210.severity = silent # When implementing IComparable , you should also override , =, >, and >=. 
-dotnet_diagnostic.S2219.severity = silent # runtime type checking should be simplified
-dotnet_diagnostic.S2094.severity = silent # empty class (false positive)
-dotnet_diagnostic.S3973.severity = silent # braces
-dotnet_diagnostic.S2346.severity = silent # enum None flags
-
+dotnet_diagnostic.S1104.severity = silent # encapsulate fields
+dotnet_diagnostic.S3877.severity = silent # Remove this 'throw' expression.
+dotnet_diagnostic.S2699.severity = silent # add assert to test (not working with FsCheck)
+dotnet_diagnostic.S1117.severity = silent # hiding field
+## AsyncFixer
+dotnet_diagnostic.AsyncFixer01.severity = suggestion # The method dont needs async
 # Resharper 
 resharper_space_within_single_line_array_initializer_braces = true
 resharper_keep_existing_attribute_arrangement = true
+resharper_csharp_default_private_modifier = implicit
+resharper_csharp_default_internal_modifier = implicit
+resharper_csharp_object_creation_when_type_not_evident = target_typed
 resharper_max_array_initializer_elements_on_line = 10
 resharper_max_initializer_elements_on_line = 1
 resharper_trailing_comma_in_multiline_lists = true
 resharper_wrap_array_initializer_style = chop_if_long
-resharper_empty_block_style = together_same_line
+resharper_empty_block_style = together_same_line
+# FALSE POSITIVES
+dotnet_diagnostic.S2094.severity = silent # empty class (false positive)
+dotnet_diagnostic.S3925.severity = silent # Update this implementation of 'ISerializable' to conform to the recommended serialization pattern.
+
+[Usings.cs]
+dotnet_diagnostic.IDE0005.severity = silent # Using directive is unnecessary.

src/InputDisplay/Config/Settings.cs

@@ -28,11 +28,12 @@ public record SelectedTheme(
 
     public bool Borderless { get; set; }
     public bool ShadowHolding { get; set; } = true;
+    public bool HideHolding { get; set; }
     public bool ShowFrames { get; set; } = true;
     public bool ShowNeutralIcon { get; set; } = true;
     public bool AutoCorrectMultiple { get; set; } = true;
-    public bool InvertHistory { get; set; } = false;
-    public bool FramesAfter { get; set; } = false;
+    public bool InvertHistory { get; set; }
+    public bool FramesAfter { get; set; }
     public bool HideButtonRelease { get; set; }
     public SOCDMode SOCD { get; set; } = SOCDMode.Neutral;
     public bool ShortcutsEnabled { get; set; } = true;
@@ -93,6 +94,7 @@ public void CopyFrom(Settings config)
         CurrentTheme = config.CurrentTheme;
         SpaceBetweenCommands = config.SpaceBetweenCommands;
         ShadowHolding = config.ShadowHolding;
+        HideHolding = config.HideHolding;
         ShowFrames = config.ShowFrames;
         ShortcutsEnabled = config.ShortcutsEnabled;
         ClearColor = config.ClearColor;

src/InputDisplay/Config/Window/SettingsControls.cs

@@ -288,7 +288,7 @@ void SetMacroButton(ButtonName name, (int Row, int Col) pos)
         }
     }
 
-    Widget BuildThemes()
+    Grid BuildThemes()
     {
         Grid grid = new()
         {
@@ -373,15 +373,15 @@ Widget BuildThemes()
 
 
         // buttons
-        Label btnLabal = new()
+        Label btnLabel = new()
         {
             Text = "Buttons theme:",
             VerticalAlignment = VerticalAlignment.Center,
             Margin = new(0, 0, 10, 0),
         };
-        Grid.SetColumn(btnLabal, 0);
-        Grid.SetRow(btnLabal, 1);
-        grid.Widgets.Add(btnLabal);
+        Grid.SetColumn(btnLabel, 0);
+        Grid.SetRow(btnLabel, 1);
+        grid.Widgets.Add(btnLabel);
 
         ComboView btnCombo = new()
         {
@@ -451,7 +451,7 @@ Widget BuildThemes()
         return grid;
     }
 
-    Widget BuildSettings()
+    Grid BuildSettings()
     {
         Grid grid = new()
         {
@@ -481,7 +481,8 @@ Widget BuildSettings()
         AddCheck(0, 1, "Show frames", config.ShowFrames, check => config.ShowFrames = check);
         AddCheck(0, 2, "Show neutral", config.ShowNeutralIcon, check => config.ShowNeutralIcon = check);
         AddCheck(0, 3, "Shadow holding", config.ShadowHolding, check => config.ShadowHolding = check);
-        AddCheck(0, 4, "Auto correct", config.AutoCorrectMultiple, check => config.AutoCorrectMultiple = check);
+        AddCheck(0, 4, "Hide holding", config.HideHolding, check => config.HideHolding = check);
+        AddCheck(0, 5, "Auto correct", config.AutoCorrectMultiple, check => config.AutoCorrectMultiple = check);
 
         AddCheck(1, 0, "Invert history", config.InvertHistory, check => config.InvertHistory = check);
         AddCheck(1, 1, "Frames after", config.FramesAfter, check => config.FramesAfter = check);

src/InputDisplay/Inputs/Drawable/InputEntry.cs

@@ -88,6 +88,9 @@ void DrawDirection()
 
             void DrawDirectionComponent(Direction stickDirection)
             {
+                if (State.Stick.Holding && config.HideHolding)
+                    return;
+
                 if (theme.GetTexture(stickDirection) is not { } dirTexture)
                     return;
 
@@ -138,6 +141,9 @@ void DrawButtons()
 
             if (combined.IsMultiple() && theme.GetTexture(combined) is { } multiTexture)
             {
+                if (State.HasNoPressed && config.HideHolding)
+                    return;
+
                 var scale = multiTexture.GetRatioScale(config.IconSize);
                 var color = State.HasNoPressed && config.ShadowHolding ? Color.Gray : Color.White;
                 batch.Draw(multiTexture, offset, null, color, 0, Vector2.Zero, scale, SpriteEffects.None, 0);
@@ -154,7 +160,9 @@ void DrawButtons()
                         texture = ThemeManager.UnknownButton;
 
                 var scale = texture.GetRatioScale(config.IconSize);
-                var color = holding.Contains(btn) && !pressed.Contains(btn) ? Color.Gray : Color.White;
+
+                var isHolding = holding.Contains(btn) && !pressed.Contains(btn);
+                var color = isHolding && config.ShadowHolding ? Color.Gray : Color.White;
 
                 batch.Draw(texture, offset, null, color, 0, Vector2.Zero, scale, SpriteEffects.None, 0);
                 offset += commandDir * ((texture.Width * scale) + config.SpaceBetweenInputs);
@@ -177,6 +185,9 @@ void CheckButton(GameInput.Button button, ButtonName name)
             {
                 var btn = buttons[index];
 
+                if (button.Status is GameInput.ButtonStatus.Holding && config.HideHolding)
+                    continue;
+
                 if (config.ShadowHolding)
                     switch (button.Status)
                     {