Tig преди 10 месеца
родител
ревизия
1f793b09ec
променени са 5 файла, в които са добавени 20 реда и са изтрити 20 реда
  1. 1 1
      Terminal.Gui/View/HighlightStyle.cs
  2. 1 1
      Terminal.Gui/View/View.Diagnostics.cs
  3. 3 3
      Terminal.Gui/View/View.Drawing.cs
  4. 5 5
      Terminal.Gui/View/View.Mouse.cs
  5. 10 10
      UICatalog/UICatalog.cs

+ 1 - 1
Terminal.Gui/View/HighlightStyle.cs

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

+ 1 - 1
Terminal.Gui/View/View.Diagnostics.cs

@@ -22,7 +22,7 @@ public enum ViewDiagnosticFlags : uint
     /// <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"/>.
     /// </summary>
-    MouseOver = 0b_0000_00100
+    Hover = 0b_0000_00100
 }
 
 public partial class View

+ 3 - 3
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 ());
         }

+ 5 - 5
Terminal.Gui/View/View.Mouse.cs

@@ -137,7 +137,7 @@ public partial class View // Mouse APIs
 
     #region MouseEnterLeave
 
-    private bool _mouseOver;
+    private bool _Hover;
 
     /// <summary>
     ///     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);
 
-        _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 ();
         }

+ 10 - 10
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<MenuItem> 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;