averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Place scrollbars correctly for positive inset

Browse Source 
Make sure that the scrollbar stretches to the top of the window even if
the text inset is > 0 (and similarly for the horizontal scrollbar).
This applies to the Core Text and ATSUI renderers only.
This commit is contained in:
Bjorn Winckler
2010-02-13 15:11:41 +01:00
parent b7bbbc85bf
commit d6be8fd0ed
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/MMAtsuiTextView.m
+29 -6
View File
@@ -207,30 +207,53 @@ defaultLineHeightForFont(NSFont *font)
- (NSRect)rectForRowsInRange:(NSRange)range
{
NSRect rect = { 0, 0, 0, 0 };
// Compute rect whose vertical dimensions cover the rows in the given
// range.
// NOTE: The rect should be in _flipped_ coordinates and the first row must
// include the top inset as well. (This method is only used to place the
// scrollbars inside MMVimView.)
NSRect rect = { {0, 0}, {0, 0} };
unsigned start = range.location > maxRows ? maxRows : range.location;
unsigned length = range.length;
if (start + length > maxRows)
length = maxRows - start;
rect.origin.y = cellSize.height * start + insetSize.height;
rect.size.height = cellSize.height * length;
if (start > 0) {
rect.origin.y = cellSize.height * start + insetSize.height;
rect.size.height = cellSize.height * length;
} else {
// Include top inset
rect.origin.y = 0;
rect.size.height = cellSize.height * length + insetSize.height;
}
return rect;
}
- (NSRect)rectForColumnsInRange:(NSRange)range
{
NSRect rect = { 0, 0, 0, 0 };
// Compute rect whose horizontal dimensions cover the columns in the given
// range.
// NOTE: The first column must include the left inset. (This method is
// only used to place the scrollbars inside MMVimView.)
NSRect rect = { {0, 0}, {0, 0} };
unsigned start = range.location > maxColumns ? maxColumns : range.location;
unsigned length = range.length;
if (start+length > maxColumns)
length = maxColumns - start;
rect.origin.x = cellSize.width * start + insetSize.width;
rect.size.width = cellSize.width * length;
if (start > 0) {
rect.origin.x = cellSize.width * start + insetSize.width;
rect.size.width = cellSize.width * length;
} else {
// Include left inset
rect.origin.x = 0;
rect.size.width = cellSize.width * length + insetSize.width;
}
return rect;
}
src/MacVim/MMCoreTextView.m
+27 -4
View File
@@ -229,6 +229,12 @@ defaultAdvanceForFont(CTFontRef fontRef)
- (NSRect)rectForRowsInRange:(NSRange)range
{
// Compute rect whose vertical dimensions cover the rows in the given
// range.
// NOTE: The rect should be in _flipped_ coordinates and the first row must
// include the top inset as well. (This method is only used to place the
// scrollbars inside MMVimView.)
NSRect rect = { {0, 0}, {0, 0} };
unsigned start = range.location > maxRows ? maxRows : range.location;
unsigned length = range.length;
@@ -236,14 +242,25 @@ defaultAdvanceForFont(CTFontRef fontRef)
if (start + length > maxRows)
length = maxRows - start;
rect.origin.y = cellSize.height * start + insetSize.height;
rect.size.height = cellSize.height * length;
if (start > 0) {
rect.origin.y = cellSize.height * start + insetSize.height;
rect.size.height = cellSize.height * length;
} else {
// Include top inset
rect.origin.y = 0;
rect.size.height = cellSize.height * length + insetSize.height;
}
return rect;
}
- (NSRect)rectForColumnsInRange:(NSRange)range
{
// Compute rect whose horizontal dimensions cover the columns in the given
// range.
// NOTE: The first column must include the left inset. (This method is
// only used to place the scrollbars inside MMVimView.)
NSRect rect = { {0, 0}, {0, 0} };
unsigned start = range.location > maxColumns ? maxColumns : range.location;
unsigned length = range.length;
@@ -251,8 +268,14 @@ defaultAdvanceForFont(CTFontRef fontRef)
if (start+length > maxColumns)
length = maxColumns - start;
rect.origin.x = cellSize.width * start + insetSize.width;
rect.size.width = cellSize.width * length;
if (start > 0) {
rect.origin.x = cellSize.width * start + insetSize.width;
rect.size.width = cellSize.width * length;
} else {
// Include left inset
rect.origin.x = 0;
rect.size.width = cellSize.width * length + insetSize.width;
}
return rect;
}