All tests pass

This commit is contained in:
Tigger Kindel
2023-03-30 08:41:52 -06:00
parent 36d92cc4e5
commit 94ac462350
2 changed files with 16 additions and 4 deletions

View File

@@ -2424,19 +2424,30 @@ namespace Terminal.Gui {
get => base.Enabled;
set {
if (base.Enabled != value) {
if (value) if (SuperView == null || SuperView?.Enabled == true) base.Enabled = value;
else base.Enabled = value;
if (!value && HasFocus) SetHasFocus (false, this);
if (value) {
if (SuperView == null || SuperView?.Enabled == true) {
base.Enabled = value;
}
} else {
base.Enabled = value;
}
if (!value && HasFocus) {
SetHasFocus (false, this);
}
OnEnabledChanged ();
SetNeedsDisplay ();
if (subviews != null) foreach (var view in subviews) if (!value) {
if (subviews != null) {
foreach (var view in subviews) {
if (!value) {
view.oldEnabled = view.Enabled;
view.Enabled = false;
} else {
view.Enabled = view.oldEnabled;
view.addingView = false;
}
}
}
}
}
}

View File

@@ -1263,6 +1263,7 @@ namespace Terminal.Gui.ViewTests {
Assert.True (view.CanFocus);
Assert.True (view.HasFocus);
wasClicked = false;
view.Enabled = false;
view.ProcessKey (new KeyEvent (Key.Enter, null));
Assert.False (wasClicked);