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

Merge pull request #2338 from BDisp/scrollview-clip-fix_2331

Browse Source 
Fixes #2331. ScrollView may not be honoring clip region; CustomButton shows outside
This commit is contained in:
Tig
2023-02-09 16:38:24 -08:00
committed by GitHub
parent 76457772a1 51c64babc7
commit 20c685b1bf
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Terminal.Gui/Core/View.cs
View File

@@ -1575,8 +1575,18 @@ namespace Terminal.Gui {
var driverClip = Driver == null ? Rect.Empty : Driver.Clip;
containerBounds.X = Math.Max (containerBounds.X, driverClip.X);
containerBounds.Y = Math.Max (containerBounds.Y, driverClip.Y);
containerBounds.Width = Math.Min (containerBounds.Width, driverClip.Width);
containerBounds.Height = Math.Min (containerBounds.Height, driverClip.Height);
var lenOffset = (driverClip.X + driverClip.Width) - (containerBounds.X + containerBounds.Width);
if (containerBounds.X + containerBounds.Width > driverClip.X + driverClip.Width) {
containerBounds.Width = Math.Max (containerBounds.Width + lenOffset, 0);
} else {
containerBounds.Width = Math.Min (containerBounds.Width, driverClip.Width);
}
lenOffset = (driverClip.Y + driverClip.Height) - (containerBounds.Y + containerBounds.Height);
if (containerBounds.Y + containerBounds.Height > driverClip.Y + driverClip.Height) {
containerBounds.Height = Math.Max (containerBounds.Height + lenOffset, 0);
} else {
containerBounds.Height = Math.Min (containerBounds.Height, driverClip.Height);
}
return containerBounds;
}