Skip to content

Fix inconsistent bottom padding in split panes #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
csmarshall wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix inconsistent bottom padding in split panes #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions sources/PTYTextView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,6 +1529,14 @@ - (NSRect)visibleRectExcludingTopMargin:(BOOL)excludeTopMargin
NSRect rect = self.enclosingScrollView.documentVisibleRect;
// Subtract the top margin's height.
rect.origin.y = row * _lineHeight;

// Align text from the bottom instead of the top by adding excess pixels to the top.
// This ensures consistent bottom padding across split panes.
const double currentExcess = [self excess];
const CGFloat bottomMarginHeight = [iTermPreferences intForKey:kPreferenceKeyTopBottomMargins];
const double topOffset = MAX(0, currentExcess - bottomMarginHeight);
rect.origin.y += topOffset;

if (excludeTopMargin) {
rect.size.height -= [iTermPreferences intForKey:kPreferenceKeyTopBottomMargins];
} else {
Expand Down Expand Up @@ -1789,8 +1797,9 @@ - (void)updateScrollerForBackgroundColor {
}
}

// Number of extra lines below the last line of text that are always the background color.
// This is 2 except for just after the frame has changed and things are resizing.
// Number of extra pixels that don't fit evenly into line heights.
// This is used to calculate top offset for bottom-aligned text rendering.
// The value is at least the bottom margin height (typically 2px).
- (double)excess {
NSRect visibleRectExcludingTopAndBottomMargins = [self scrollViewContentSize];
visibleRectExcludingTopAndBottomMargins.size.height -= [iTermPreferences intForKey:kPreferenceKeyTopBottomMargins] * 2; // Height without top and bottom margins.
Expand Down