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

* Images/NSRemoveTemplate.tiff: Add file.

Browse source 
* Images/GNUmakefile: Handle new file.
        * Source/GSXibLoader.m: Better error reporting for wrong
        application class.
        * Source/NSOutline.m (-drawRow:clipRect:): Don't set the value
        for the edited cell.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38408 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2015-03-15 23:31:43 +00:00
parent 830a6ef782
commit 6d27cf76b1
5 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/NSOutlineView.m
View file

@ -963,17 +963,20 @@ static NSImage *unexpandable = nil;
NSTableColumn *tb = [_tableColumns objectAtIndex: i];
NSCell *cell = [self preparedCellAtColumn: i row: rowIndex];
[self _willDisplayCell: cell
forTableColumn: tb
row: rowIndex];
if (i == _editedColumn && rowIndex == _editedRow)
{
[cell _setInEditing: YES];
[cell setShowsFirstResponder: YES];
}
[self _willDisplayCell: cell
forTableColumn: tb
row: rowIndex];
[cell setObjectValue: [_dataSource outlineView: self
objectValueForTableColumn: tb
byItem: item]];
else
{
[cell setObjectValue: [_dataSource outlineView: self
objectValueForTableColumn: tb
byItem: item]];
}
drawingRect = [self frameOfCellAtColumn: i
row: rowIndex];
@ -1544,8 +1547,6 @@ Also returns the child index relative to this parent. */
NSTableColumn *tb;
NSRect drawingRect;
unsigned length = 0;
int level = 0;
float indentationFactor = 0.0;
// We refuse to edit cells if the delegate can not accept results
// of editing.
@ -1554,16 +1555,22 @@ Also returns the child index relative to this parent. */
flag = YES;
}
[self scrollRowToVisible: rowIndex];
[self scrollColumnToVisible: columnIndex];
if (rowIndex != _selectedRow)
{
[NSException raise:NSInvalidArgumentException
format:@"Attempted to edit unselected row"];
}
if (rowIndex < 0 || rowIndex >= _numberOfRows
if (rowIndex < 0 || rowIndex >= _numberOfRows
|| columnIndex < 0 || columnIndex >= _numberOfColumns)
{
[NSException raise: NSInvalidArgumentException
format: @"Row/column out of index in edit"];
}
[self scrollRowToVisible: rowIndex];
[self scrollColumnToVisible: columnIndex];
if (_textObject != nil)
{
[self validateEditing];
@ -1627,6 +1634,8 @@ Also returns the child index relative to this parent. */
NSImage *image = nil;
NSCell *imageCell = nil;
NSRect imageRect;
int level = 0;
float indentationFactor = 0.0;
item = [self itemAtRow: rowIndex];
// determine which image to use...