From 3a1613195479c218d72ebfa91b01a6d7a4af1294 Mon Sep 17 00:00:00 2001 From: iAmAsval Date: Sun, 27 Jun 2021 02:47:24 +0200 Subject: [PATCH] Fold Toggle At Level --- FModel/Views/Resources/Controls/Aed/BraceFoldingStrategy.cs | 4 ++-- FModel/Views/Resources/Controls/PropertiesPopout.xaml.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FModel/Views/Resources/Controls/Aed/BraceFoldingStrategy.cs b/FModel/Views/Resources/Controls/Aed/BraceFoldingStrategy.cs index 54d72e17..127090cb 100644 --- a/FModel/Views/Resources/Controls/Aed/BraceFoldingStrategy.cs +++ b/FModel/Views/Resources/Controls/Aed/BraceFoldingStrategy.cs @@ -42,7 +42,7 @@ namespace FModel.Views.Resources.Controls foldSection[^1].IsFolded = !foldSection[^1].IsFolded; } - public void FoldAtLevel(int level = 0) + public void FoldToggleAtLevel(int level = 0) { if (_foldingManager.AllFoldings == null) return; @@ -50,7 +50,7 @@ namespace FModel.Views.Resources.Controls foreach (var folding in _foldingManager.AllFoldings) { if (folding.Tag is not CustomNewFolding realFolding) continue; - if (realFolding.Level == level) folding.IsFolded = true; + if (realFolding.Level == level) folding.IsFolded = !folding.IsFolded; } } } diff --git a/FModel/Views/Resources/Controls/PropertiesPopout.xaml.cs b/FModel/Views/Resources/Controls/PropertiesPopout.xaml.cs index c6fbe181..5eec8649 100644 --- a/FModel/Views/Resources/Controls/PropertiesPopout.xaml.cs +++ b/FModel/Views/Resources/Controls/PropertiesPopout.xaml.cs @@ -79,7 +79,7 @@ namespace FModel.Views.Resources.Controls _manager.FoldToggle(MyAvalonEditor.CaretOffset); break; case >= Key.D0 and <= Key.D9 when Keyboard.IsKeyDown(Key.K) && Keyboard.Modifiers.HasFlag(ModifierKeys.Control): - _manager.FoldAtLevel(int.Parse(e.Key.ToString()[1].ToString())); + _manager.FoldToggleAtLevel(int.Parse(e.Key.ToString()[1].ToString())); break; } }