From 1f793b09ecadafa816cf8c8a37f8d5a1773e85ce Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 22 Sep 2024 06:56:21 -0600 Subject: [PATCH] Consistent naming --- Terminal.Gui/View/HighlightStyle.cs | 2 +- Terminal.Gui/View/View.Diagnostics.cs | 2 +- Terminal.Gui/View/View.Drawing.cs | 6 +++--- Terminal.Gui/View/View.Mouse.cs | 10 +++++----- UICatalog/UICatalog.cs | 20 ++++++++++---------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Terminal.Gui/View/HighlightStyle.cs b/Terminal.Gui/View/HighlightStyle.cs index 700866f22..8d2766ade 100644 --- a/Terminal.Gui/View/HighlightStyle.cs +++ b/Terminal.Gui/View/HighlightStyle.cs @@ -15,7 +15,7 @@ public enum HighlightStyle None = 0, /// - /// The mouse is hovering over the view. + /// The mouse is hovering over the view (but not pressed). See . /// Hover = 1, diff --git a/Terminal.Gui/View/View.Diagnostics.cs b/Terminal.Gui/View/View.Diagnostics.cs index 460801033..8145af8fc 100644 --- a/Terminal.Gui/View/View.Diagnostics.cs +++ b/Terminal.Gui/View/View.Diagnostics.cs @@ -22,7 +22,7 @@ public enum ViewDiagnosticFlags : uint /// /// When enabled the View's colors will be darker when the mouse is hovering over the View (See and . /// - MouseOver = 0b_0000_00100 + Hover = 0b_0000_00100 } public partial class View diff --git a/Terminal.Gui/View/View.Drawing.cs b/Terminal.Gui/View/View.Drawing.cs index 85e2512a0..154c273f8 100644 --- a/Terminal.Gui/View/View.Drawing.cs +++ b/Terminal.Gui/View/View.Drawing.cs @@ -396,7 +396,7 @@ public partial class View // Drawing APIs } Attribute disabled = new (cs.Disabled.Foreground, cs.Disabled.Background); - if (Diagnostics.HasFlag (ViewDiagnosticFlags.MouseOver) && _mouseOver) + if (Diagnostics.HasFlag (ViewDiagnosticFlags.Hover) && _Hover) { disabled = new (disabled.Foreground.GetDarkerColor (), disabled.Background.GetDarkerColor ()); } @@ -406,12 +406,12 @@ public partial class View // Drawing APIs private Attribute GetColor (Attribute inputAttribute) { Attribute attr = inputAttribute; - if (HighlightStyle.HasFlag (HighlightStyle.Hover) && _mouseOver) + if (HighlightStyle.HasFlag (HighlightStyle.Hover) && _Hover) { attr = new (inputAttribute.Foreground.GetHighlightColor (), inputAttribute.Background); } - if (Diagnostics.HasFlag (ViewDiagnosticFlags.MouseOver) && _mouseOver) + if (Diagnostics.HasFlag (ViewDiagnosticFlags.Hover) && _Hover) { attr = new (attr.Foreground.GetDarkerColor (), attr.Background.GetDarkerColor ()); } diff --git a/Terminal.Gui/View/View.Mouse.cs b/Terminal.Gui/View/View.Mouse.cs index a708d9ebc..f27ab07b5 100644 --- a/Terminal.Gui/View/View.Mouse.cs +++ b/Terminal.Gui/View/View.Mouse.cs @@ -137,7 +137,7 @@ public partial class View // Mouse APIs #region MouseEnterLeave - private bool _mouseOver; + private bool _Hover; /// /// INTERNAL Called by when the mouse moves over the View's . @@ -165,14 +165,14 @@ public partial class View // Mouse APIs MouseEnter?.Invoke (this, eventArgs); - _mouseOver = !eventArgs.Cancel; + _Hover = !eventArgs.Cancel; if (eventArgs.Cancel) { return true; } - if ((HighlightStyle.HasFlag(HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.MouseOver))) + if ((HighlightStyle.HasFlag(HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.Hover))) { SetNeedsDisplay (); } @@ -252,9 +252,9 @@ public partial class View // Mouse APIs MouseLeave?.Invoke (this, EventArgs.Empty); - _mouseOver = false; + _Hover = false; - if ((HighlightStyle.HasFlag (HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.MouseOver))) + if ((HighlightStyle.HasFlag (HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.Hover))) { SetNeedsDisplay (); } diff --git a/UICatalog/UICatalog.cs b/UICatalog/UICatalog.cs index 5e013522b..a1c1fe97d 100644 --- a/UICatalog/UICatalog.cs +++ b/UICatalog/UICatalog.cs @@ -780,7 +780,7 @@ public class UICatalogApp const string OFF = "View Diagnostics: _Off"; const string RULER = "View Diagnostics: _Ruler"; const string PADDING = "View Diagnostics: _Padding"; - const string MOUSEOVER = "View Diagnostics: _MouseOver"; + const string Hover = "View Diagnostics: _Hover"; var index = 0; List menuItems = new (); @@ -798,7 +798,7 @@ public class UICatalogApp { item.Checked = !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Padding) && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Ruler) - && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.MouseOver); + && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Hover); } else { @@ -811,12 +811,12 @@ public class UICatalogApp if (item.Title == t && item.Checked == false) { - _diagnosticFlags &= ~(ViewDiagnosticFlags.Padding | ViewDiagnosticFlags.Ruler | ViewDiagnosticFlags.MouseOver); + _diagnosticFlags &= ~(ViewDiagnosticFlags.Padding | ViewDiagnosticFlags.Ruler | ViewDiagnosticFlags.Hover); item.Checked = true; } else if (item.Title == t && item.Checked == true) { - _diagnosticFlags |= ViewDiagnosticFlags.Padding | ViewDiagnosticFlags.Ruler | ViewDiagnosticFlags.MouseOver; + _diagnosticFlags |= ViewDiagnosticFlags.Padding | ViewDiagnosticFlags.Ruler | ViewDiagnosticFlags.Hover; item.Checked = false; } else @@ -839,7 +839,7 @@ public class UICatalogApp { menuItem.Checked = !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Ruler) && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Padding) - && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.MouseOver); + && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Hover); } else if (menuItem.Title != t) { @@ -862,7 +862,7 @@ public class UICatalogApp "Off" => OFF, "Ruler" => RULER, "Padding" => PADDING, - "MouseOver" => MOUSEOVER, + "Hover" => Hover, _ => "" }; } @@ -873,7 +873,7 @@ public class UICatalogApp { RULER => ViewDiagnosticFlags.Ruler, PADDING => ViewDiagnosticFlags.Padding, - MOUSEOVER => ViewDiagnosticFlags.MouseOver, + Hover => ViewDiagnosticFlags.Hover, _ => null! }; } @@ -904,14 +904,14 @@ public class UICatalogApp } break; - case ViewDiagnosticFlags.MouseOver: + case ViewDiagnosticFlags.Hover: if (add) { - _diagnosticFlags |= ViewDiagnosticFlags.MouseOver; + _diagnosticFlags |= ViewDiagnosticFlags.Hover; } else { - _diagnosticFlags &= ~ViewDiagnosticFlags.MouseOver; + _diagnosticFlags &= ~ViewDiagnosticFlags.Hover; } break;