Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Invert this for readability and less nesting

Browse Source
This commit is contained in:
Brandon Thetford
2024-02-21 03:05:11 -07:00
parent 27fe9eeb7d
commit ecb6ff9952
1 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
Terminal.Gui/Application.cs
View File

@@ -1492,81 +1492,32 @@ public static partial class Application
}
}
if (view is { })
if (view is null)
{
// Work inside-out (Padding, Border, Margin)
// TODO: Debate whether inside-out or outside-in is the right strategy
if (AdornmentHandledMouseEvent (view?.Padding, a))
return;
}
// Work inside-out (Padding, Border, Margin)
// TODO: Debate whether inside-out or outside-in is the right strategy
if (AdornmentHandledMouseEvent (view.Padding, a))
{
return;
}
if (AdornmentHandledMouseEvent (view.Border, a))
{
if (view is Toplevel)
{
return;
}
if (AdornmentHandledMouseEvent (view?.Border, a))
{
if (view is Toplevel)
{
// TODO: This is a temporary hack to work around the fact that
// drag handling is handled in Toplevel (See Issue #2537)
var me = new MouseEvent
{
X = screenX,
Y = screenY,
Flags = a.MouseEvent.Flags,
OfX = screenX,
OfY = screenY,
View = view
};
if (_mouseEnteredView is null)
{
_mouseEnteredView = view;
view.OnMouseEnter (me);
}
else if (_mouseEnteredView != view)
{
_mouseEnteredView.OnMouseLeave (me);
view.OnMouseEnter (me);
_mouseEnteredView = view;
}
if (!view.WantMousePositionReports && a.MouseEvent.Flags == MouseFlags.ReportMousePosition)
{
return;
}
WantContinuousButtonPressedView = view.WantContinuousButtonPressed ? view : null;
if (view.OnMouseEvent (me))
{
// Should we bubble up the event, if it is not handled?
//return;
}
BringOverlappedTopToFront ();
}
return;
}
if (AdornmentHandledMouseEvent (view?.Margin, a))
{
return;
}
Rectangle bounds = view.BoundsToScreen (view.Bounds);
if (bounds.Contains (a.MouseEvent.X, a.MouseEvent.Y))
{
Point boundsPoint = view.ScreenToBounds (a.MouseEvent.X, a.MouseEvent.Y);
// TODO: This is a temporary hack to work around the fact that
// drag handling is handled in Toplevel (See Issue #2537)
var me = new MouseEvent
{
X = boundsPoint.X,
Y = boundsPoint.Y,
X = screenX,
Y = screenY,
Flags = a.MouseEvent.Flags,
OfX = boundsPoint.X,
OfY = boundsPoint.Y,
OfX = screenX,
OfY = screenY,
View = view
};
@@ -1597,6 +1548,57 @@ public static partial class Application
BringOverlappedTopToFront ();
}
return;
}
if (AdornmentHandledMouseEvent (view?.Margin, a))
{
return;
}
Rectangle bounds = view.BoundsToScreen (view.Bounds);
if (bounds.Contains (a.MouseEvent.X, a.MouseEvent.Y))
{
Point boundsPoint = view.ScreenToBounds (a.MouseEvent.X, a.MouseEvent.Y);
var me = new MouseEvent
{
X = boundsPoint.X,
Y = boundsPoint.Y,
Flags = a.MouseEvent.Flags,
OfX = boundsPoint.X,
OfY = boundsPoint.Y,
View = view
};
if (_mouseEnteredView is null)
{
_mouseEnteredView = view;
view.OnMouseEnter (me);
}
else if (_mouseEnteredView != view)
{
_mouseEnteredView.OnMouseLeave (me);
view.OnMouseEnter (me);
_mouseEnteredView = view;
}
if (!view.WantMousePositionReports && a.MouseEvent.Flags == MouseFlags.ReportMousePosition)
{
return;
}
WantContinuousButtonPressedView = view.WantContinuousButtonPressed ? view : null;
if (view.OnMouseEvent (me))
{
// Should we bubble up the event, if it is not handled?
//return;
}
BringOverlappedTopToFront ();
}
return;