mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 08:30:59 +00:00
* Source/NSTableView.m (-tile): Check the GSScrollViewNoInnerBorder
user default to see whether to expand the corner view by 1pt or not. * Source/GSThemeDrawing.m (-drawTableHeaderRect:inView:): Remove special case which reduced the width of the last column header by 1pt. I don't see any reason for doing that and it looks better to me without the gap, and more uniform for themeing. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37237 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
74bd902874
commit
4e1aeabe94
3 changed files with 15 additions and 40 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2013-10-15 Eric Wasylishen <ewasylishen@gmail.com>
|
||||
|
||||
* Source/NSTableView.m (-tile): Check the GSScrollViewNoInnerBorder
|
||||
user default to see whether to expand the corner view by 1pt or not.
|
||||
* Source/GSThemeDrawing.m (-drawTableHeaderRect:inView:): Remove
|
||||
special case which reduced the width of the last column header by 1pt.
|
||||
|
||||
I don't see any reason for doing that and it looks better to me without
|
||||
the gap, and more uniform for themeing.
|
||||
|
||||
2013-10-15 Eric Wasylishen <ewasylishen@gmail.com>
|
||||
|
||||
* Source/NSButtonCell.m:
|
||||
|
|
|
@ -2745,7 +2745,7 @@ typedef enum {
|
|||
columns = [tableView tableColumns];
|
||||
highlightedTableColumn = [tableView highlightedTableColumn];
|
||||
|
||||
for (i = firstColumnToDraw; i < lastColumnToDraw; i++)
|
||||
for (i = firstColumnToDraw; i <= lastColumnToDraw; i++)
|
||||
{
|
||||
column = [columns objectAtIndex: i];
|
||||
width = [column width];
|
||||
|
@ -2764,44 +2764,6 @@ typedef enum {
|
|||
inView: tableHeaderView];
|
||||
drawingRect.origin.x += width;
|
||||
}
|
||||
if (lastColumnToDraw == [tableView numberOfColumns] - 1)
|
||||
{
|
||||
column = [columns objectAtIndex: lastColumnToDraw];
|
||||
width = [column width] - 1;
|
||||
drawingRect.size.width = width;
|
||||
cell = [column headerCell];
|
||||
if ((column == highlightedTableColumn)
|
||||
|| [tableView isColumnSelected: lastColumnToDraw])
|
||||
{
|
||||
[cell setHighlighted: YES];
|
||||
}
|
||||
else
|
||||
{
|
||||
[cell setHighlighted: NO];
|
||||
}
|
||||
[cell drawWithFrame: drawingRect
|
||||
inView: tableHeaderView];
|
||||
drawingRect.origin.x += width;
|
||||
}
|
||||
else
|
||||
{
|
||||
column = [columns objectAtIndex: lastColumnToDraw];
|
||||
width = [column width];
|
||||
drawingRect.size.width = width;
|
||||
cell = [column headerCell];
|
||||
if ((column == highlightedTableColumn)
|
||||
|| [tableView isColumnSelected: lastColumnToDraw])
|
||||
{
|
||||
[cell setHighlighted: YES];
|
||||
}
|
||||
else
|
||||
{
|
||||
[cell setHighlighted: NO];
|
||||
}
|
||||
[cell drawWithFrame: drawingRect
|
||||
inView: tableHeaderView];
|
||||
drawingRect.origin.x += width;
|
||||
}
|
||||
}
|
||||
|
||||
- (void) drawPopUpButtonCellInteriorWithFrame: (NSRect)cellFrame
|
||||
|
|
|
@ -4967,11 +4967,14 @@ This method is deprecated, use -columnIndexesInRect:. */
|
|||
|
||||
if (_headerView != nil)
|
||||
{
|
||||
CGFloat innerBorderWidth = [[NSUserDefaults standardUserDefaults]
|
||||
boolForKey: @"GSScrollViewNoInnerBorder"] ? 0.0 : 1.0;
|
||||
|
||||
[_headerView setFrameSize:
|
||||
NSMakeSize (_frame.size.width,
|
||||
[_headerView frame].size.height)];
|
||||
[_cornerView setFrameSize:
|
||||
NSMakeSize ([NSScroller scrollerWidth] + 1,
|
||||
NSMakeSize ([NSScroller scrollerWidth] + innerBorderWidth,
|
||||
[_headerView frame].size.height)];
|
||||
[_headerView setNeedsDisplay: YES];
|
||||
[_cornerView setNeedsDisplay: YES];
|
||||
|
|
Loading…
Reference in a new issue