gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 10:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSTableView.m (-tile): Check the GSScrollViewNoInnerBorder

Browse source 
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:
ericwa 2013-10-15 20:33:46 +00:00
parent cc79a86cb6
commit 7ebdcd6517
3 changed files with 15 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -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> 2013-10-15 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSButtonCell.m: * Source/NSButtonCell.m:

40
Source/GSThemeDrawing.m
View file

@ -2745,7 +2745,7 @@ typedef enum {
columns = [tableView tableColumns]; columns = [tableView tableColumns];
highlightedTableColumn = [tableView highlightedTableColumn]; highlightedTableColumn = [tableView highlightedTableColumn];
for (i = firstColumnToDraw; i < lastColumnToDraw; i++) for (i = firstColumnToDraw; i <= lastColumnToDraw; i++)
{ {
column = [columns objectAtIndex: i]; column = [columns objectAtIndex: i];
width = [column width]; width = [column width];
@ -2764,44 +2764,6 @@ typedef enum {
inView: tableHeaderView]; inView: tableHeaderView];
drawingRect.origin.x += width; 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 - (void) drawPopUpButtonCellInteriorWithFrame: (NSRect)cellFrame

5
Source/NSTableView.m
View file

@ -4967,11 +4967,14 @@ This method is deprecated, use -columnIndexesInRect:. */
if (_headerView != nil) if (_headerView != nil)
{ {
CGFloat innerBorderWidth = [[NSUserDefaults standardUserDefaults]
boolForKey: @"GSScrollViewNoInnerBorder"] ? 0.0 : 1.0;
[_headerView setFrameSize: [_headerView setFrameSize:
NSMakeSize (_frame.size.width, NSMakeSize (_frame.size.width,
[_headerView frame].size.height)]; [_headerView frame].size.height)];
[_cornerView setFrameSize: [_cornerView setFrameSize:
NSMakeSize ([NSScroller scrollerWidth] + 1, NSMakeSize ([NSScroller scrollerWidth] + innerBorderWidth,
[_headerView frame].size.height)]; [_headerView frame].size.height)];
[_headerView setNeedsDisplay: YES]; [_headerView setNeedsDisplay: YES];
[_cornerView setNeedsDisplay: YES]; [_cornerView setNeedsDisplay: YES];