gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-29 19:07:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from 0.7.0

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10329 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-07-09 02:49:03 +00:00
parent ce3b319c5a
commit a56278096e
27 changed files with 794 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/NSMatrix.m
View file

@ -957,6 +957,8 @@ static SEL getSel;
if (aCell)
{
NSRect cellFrame;
if (_selectedCell && _selectedCell != aCell)
{
[_selectedCell setShowsFirstResponder: NO];
@ -969,6 +971,8 @@ static SEL getSel;
_selectedColumn = column;
_selectedCells[row][column] = YES;
cellFrame = [self cellFrameAtRow: row column: column];
if ([_cells[row][column] acceptsFirstResponder])
{
int lastRow, lastColumn;
@ -980,7 +984,8 @@ static SEL getSel;
_dottedColumn = column;
if (lastRow != -1 && lastColumn != -1
&& (lastRow != row || lastColumn != column))
&& (lastRow != row || lastColumn != column)
&& [self window] != nil)
[self drawCellAtRow: lastRow column: lastColumn];
}
@ -989,13 +994,16 @@ static SEL getSel;
if (_mode == NSListModeMatrix)
[aCell setCellAttribute: NSCellHighlighted to: 1];
if (_autoscroll)
[self scrollRectToVisible: cellFrame];
// Note: we select the cell iff it is 'selectable', not 'editable'
// as macosx says. This looks definitely more appropriate.
// [This is going to start editing only if the cell is also editable,
// otherwise the text gets selected and that's all.]
[self selectTextAtRow: row column: column];
[self setNeedsDisplayInRect: [self cellFrameAtRow: row column: column]];
[self setNeedsDisplayInRect: cellFrame];
}
else
{
@ -1465,7 +1473,10 @@ static SEL getSel;
case NSReturnTextMovement:
if ([self sendAction] == NO)
{
if ([self performKeyEquivalent: [_window currentEvent]] == NO)
NSEvent *event = [_window currentEvent];
if ([self performKeyEquivalent: event] == NO
&& [_window performKeyEquivalent: event] == NO)
[self selectText: self];
}
break;