Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistent naming

Browse Source
This commit is contained in:
Tig
2024-09-22 06:56:21 -06:00
parent 3c1d6a8504
commit 1f793b09ec
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/View/HighlightStyle.cs
View File

@@ -15,7 +15,7 @@ public enum HighlightStyle
None = 0, None = 0,
/// <summary> /// <summary>
/// The mouse is hovering over the view. /// The mouse is hovering over the view (but not pressed). See <see cref="View.MouseEnter"/>.
/// </summary> /// </summary>
Hover = 1, Hover = 1,

2
Terminal.Gui/View/View.Diagnostics.cs
View File

@@ -22,7 +22,7 @@ public enum ViewDiagnosticFlags : uint
/// <summary> /// <summary>
/// When enabled the View's colors will be darker when the mouse is hovering over the View (See <see cref="View.MouseEnter"/> and <see cref="View.MouseLeave"/>. /// When enabled the View's colors will be darker when the mouse is hovering over the View (See <see cref="View.MouseEnter"/> and <see cref="View.MouseLeave"/>.
/// </summary> /// </summary>
MouseOver = 0b_0000_00100 Hover = 0b_0000_00100
} }
public partial class View public partial class View

6
Terminal.Gui/View/View.Drawing.cs
View File

@@ -396,7 +396,7 @@ public partial class View // Drawing APIs
} }
Attribute disabled = new (cs.Disabled.Foreground, cs.Disabled.Background); 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 ()); disabled = new (disabled.Foreground.GetDarkerColor (), disabled.Background.GetDarkerColor ());
} }
@@ -406,12 +406,12 @@ public partial class View // Drawing APIs
private Attribute GetColor (Attribute inputAttribute) private Attribute GetColor (Attribute inputAttribute)
{ {
Attribute attr = inputAttribute; Attribute attr = inputAttribute;
if (HighlightStyle.HasFlag (HighlightStyle.Hover) && _mouseOver) if (HighlightStyle.HasFlag (HighlightStyle.Hover) && _Hover)
{ {
attr = new (inputAttribute.Foreground.GetHighlightColor (), inputAttribute.Background); 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 ()); attr = new (attr.Foreground.GetDarkerColor (), attr.Background.GetDarkerColor ());
} }

10
Terminal.Gui/View/View.Mouse.cs
View File

@@ -137,7 +137,7 @@ public partial class View // Mouse APIs
#region MouseEnterLeave #region MouseEnterLeave
private bool _mouseOver; private bool _Hover;
/// <summary> /// <summary>
/// INTERNAL Called by <see cref="Application.OnMouseEvent"/> when the mouse moves over the View's <see cref="Frame"/>. /// INTERNAL Called by <see cref="Application.OnMouseEvent"/> when the mouse moves over the View's <see cref="Frame"/>.
@@ -165,14 +165,14 @@ public partial class View // Mouse APIs
MouseEnter?.Invoke (this, eventArgs); MouseEnter?.Invoke (this, eventArgs);
_mouseOver = !eventArgs.Cancel; _Hover = !eventArgs.Cancel;
if (eventArgs.Cancel) if (eventArgs.Cancel)
{ {
return true; return true;
} }
if ((HighlightStyle.HasFlag(HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.MouseOver))) if ((HighlightStyle.HasFlag(HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.Hover)))
{ {
SetNeedsDisplay (); SetNeedsDisplay ();
} }
@@ -252,9 +252,9 @@ public partial class View // Mouse APIs
MouseLeave?.Invoke (this, EventArgs.Empty); 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 (); SetNeedsDisplay ();
} }

20
UICatalog/UICatalog.cs
View File

@@ -780,7 +780,7 @@ public class UICatalogApp
const string OFF = "View Diagnostics: _Off"; const string OFF = "View Diagnostics: _Off";
const string RULER = "View Diagnostics: _Ruler"; const string RULER = "View Diagnostics: _Ruler";
const string PADDING = "View Diagnostics: _Padding"; const string PADDING = "View Diagnostics: _Padding";
const string MOUSEOVER = "View Diagnostics: _MouseOver"; const string Hover = "View Diagnostics: _Hover";
var index = 0; var index = 0;
List<MenuItem> menuItems = new (); List<MenuItem> menuItems = new ();
@@ -798,7 +798,7 @@ public class UICatalogApp
{ {
item.Checked = !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Padding) item.Checked = !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Padding)
&& !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Ruler) && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Ruler)
&& !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.MouseOver); && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Hover);
} }
else else
{ {
@@ -811,12 +811,12 @@ public class UICatalogApp
if (item.Title == t && item.Checked == false) if (item.Title == t && item.Checked == false)
{ {
_diagnosticFlags &= ~(ViewDiagnosticFlags.Padding | ViewDiagnosticFlags.Ruler | ViewDiagnosticFlags.MouseOver); _diagnosticFlags &= ~(ViewDiagnosticFlags.Padding | ViewDiagnosticFlags.Ruler | ViewDiagnosticFlags.Hover);
item.Checked = true; item.Checked = true;
} }
else if (item.Title == t && 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; item.Checked = false;
} }
else else
@@ -839,7 +839,7 @@ public class UICatalogApp
{ {
menuItem.Checked = !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Ruler) menuItem.Checked = !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Ruler)
&& !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Padding) && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Padding)
&& !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.MouseOver); && !_diagnosticFlags.HasFlag (ViewDiagnosticFlags.Hover);
} }
else if (menuItem.Title != t) else if (menuItem.Title != t)
{ {
@@ -862,7 +862,7 @@ public class UICatalogApp
"Off" => OFF, "Off" => OFF,
"Ruler" => RULER, "Ruler" => RULER,
"Padding" => PADDING, "Padding" => PADDING,
"MouseOver" => MOUSEOVER, "Hover" => Hover,
_ => "" _ => ""
}; };
} }
@@ -873,7 +873,7 @@ public class UICatalogApp
{ {
RULER => ViewDiagnosticFlags.Ruler, RULER => ViewDiagnosticFlags.Ruler,
PADDING => ViewDiagnosticFlags.Padding, PADDING => ViewDiagnosticFlags.Padding,
MOUSEOVER => ViewDiagnosticFlags.MouseOver, Hover => ViewDiagnosticFlags.Hover,
_ => null! _ => null!
}; };
} }
@@ -904,14 +904,14 @@ public class UICatalogApp
} }
break; break;
case ViewDiagnosticFlags.MouseOver: case ViewDiagnosticFlags.Hover:
if (add) if (add)
{ {
_diagnosticFlags |= ViewDiagnosticFlags.MouseOver; _diagnosticFlags |= ViewDiagnosticFlags.Hover;
} }
else else
{ {
_diagnosticFlags &= ~ViewDiagnosticFlags.MouseOver; _diagnosticFlags &= ~ViewDiagnosticFlags.Hover;
} }
break; break;