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

* Source/NSTableView.m (-selectedColumnIndexes,

Browse source 
* -selectedRowIndexes): Return an
        autoreleased copy of the corresponding ivar. Returning a
reference to the ivar
        leads to issues (and behavior different from Cocoa) when
iterating thru the
        indexsets if at a time they would be being altered.
        Patch by Frank LeGrand (flegrand@testplant.com).
        * Source/GNUmakefile: Add NSCollectionViewItem.
        * Headers/AppKit/NSCollectionView.h,
        * Headers/AppKit/NSCollectionViewItem.h,
        * Source/NSCollectionViewItem.m,
        * Source/NSCollectionView.m: Bring closer to the GNUstep coding
        * standard.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36551 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2013-04-21 13:28:47 +00:00
parent 06c706a7c8
commit ab56e573e7
7 changed files with 336 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2013-04-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTableView.m (-selectedColumnIndexes, -selectedRowIndexes): Return an
autoreleased copy of the corresponding ivar. Returning a reference to the ivar
leads to issues (and behavior different from Cocoa) when iterating thru the
indexsets if at a time they would be being altered.
Patch by Frank LeGrand (flegrand@testplant.com).
* Source/GNUmakefile: Add NSCollectionViewItem.
* Headers/AppKit/NSCollectionView.h,
* Headers/AppKit/NSCollectionViewItem.h,
* Source/NSCollectionViewItem.m,
* Source/NSCollectionView.m: Bring closer to the GNUstep coding standard.
2013-04-17 23:54-EDT Gregory John Casamento <greg.casamento@gmail.com> 2013-04-17 23:54-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Headers/AppKit/NSCollectionView.h * Headers/AppKit/NSCollectionView.h

41
Headers/AppKit/NSCollectionView.h
View file

@ -29,11 +29,11 @@
#ifndef _GNUstep_H_NSCollectionView #ifndef _GNUstep_H_NSCollectionView
#define _GNUstep_H_NSCollectionView #define _GNUstep_H_NSCollectionView
#import <AppKit/NSNibDeclarations.h>
#import <GNUstepBase/GSVersionMacros.h> #import <GNUstepBase/GSVersionMacros.h>
#import <AppKit/NSView.h>
#import <AppKit/NSDragging.h> #import <AppKit/NSDragging.h>
#import <AppKit/NSNibDeclarations.h>
#import <AppKit/NSView.h>
@class NSCollectionViewItem; @class NSCollectionViewItem;
@class NSCollectionView; @class NSCollectionView;
@ -47,17 +47,32 @@ typedef NSInteger NSCollectionViewDropOperation;
@protocol NSCollectionViewDelegate <NSObject> @protocol NSCollectionViewDelegate <NSObject>
- (NSImage *)collectionView:(NSCollectionView *)collectionView draggingImageForItemsAtIndexes:(NSIndexSet *)indexes withEvent:(NSEvent *)event offset:(NSPointPointer)dragImageOffset; - (NSImage *)collectionView:(NSCollectionView *)collectionView
- (BOOL)collectionView:(NSCollectionView *)collectionView writeItemsAtIndexes:(NSIndexSet *)indexes toPasteboard:(NSPasteboard *)pasteboard; draggingImageForItemsAtIndexes:(NSIndexSet *)indexes
- (BOOL)collectionView:(NSCollectionView *)collectionView canDragItemsAtIndexes:(NSIndexSet *)indexes withEvent:(NSEvent *)event; withEvent:(NSEvent *)event
- (NSDragOperation)collectionView:(NSCollectionView *)collectionView validateDrop:(id < NSDraggingInfo >)draggingInfo proposedIndex:(NSInteger *)proposedDropIndex dropOperation:(NSCollectionViewDropOperation *)proposedDropOperation; offset:(NSPointPointer)dragImageOffset;
- (BOOL)collectionView:(NSCollectionView *)collectionView acceptDrop:(id < NSDraggingInfo >)draggingInfo index:(NSInteger)index dropOperation:(NSCollectionViewDropOperation)dropOperation; - (BOOL)collectionView:(NSCollectionView *)collectionView
- (NSArray *)collectionView:(NSCollectionView *)collectionView namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropURL forDraggedItemsAtIndexes:(NSIndexSet *)indexes; writeItemsAtIndexes:(NSIndexSet *)indexes
toPasteboard:(NSPasteboard *)pasteboard;
- (BOOL)collectionView:(NSCollectionView *)collectionView
canDragItemsAtIndexes:(NSIndexSet *)indexes
withEvent:(NSEvent *)event;
- (NSDragOperation)collectionView:(NSCollectionView *)collectionView
validateDrop:(id < NSDraggingInfo >)draggingInfo
proposedIndex:(NSInteger *)proposedDropIndex
dropOperation:(NSCollectionViewDropOperation *)proposedDropOperation;
- (BOOL)collectionView:(NSCollectionView *)collectionView
acceptDrop:(id < NSDraggingInfo >)draggingInfo
index:(NSInteger)index
dropOperation:(NSCollectionViewDropOperation)dropOperation;
- (NSArray *)collectionView:(NSCollectionView *)collectionView
namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropURL
forDraggedItemsAtIndexes:(NSIndexSet *)indexes;
@end @end
@interface NSCollectionView : NSView @interface NSCollectionView : NSView //<NSDraggingDestination, NSDraggingSource>
{ {
NSArray *_content; NSArray *_content;
IBOutlet NSCollectionViewItem *itemPrototype; IBOutlet NSCollectionViewItem *itemPrototype;
@ -73,13 +88,13 @@ typedef NSInteger NSCollectionViewDropOperation;
NSSize _itemSize; NSSize _itemSize;
NSSize _maxItemSize; NSSize _maxItemSize;
NSSize _minItemSize; NSSize _minItemSize;
float _tileWidth; CGFloat _tileWidth;
float _verticalMargin; CGFloat _verticalMargin;
float _horizontalMargin; CGFloat _horizontalMargin;
NSUInteger _maxNumberOfColumns; NSUInteger _maxNumberOfColumns;
NSUInteger _maxNumberOfRows; NSUInteger _maxNumberOfRows;
long _numberOfColumns; NSUInteger _numberOfColumns;
NSDragOperation _draggingSourceOperationMaskForLocal; NSDragOperation _draggingSourceOperationMaskForLocal;
NSDragOperation _draggingSourceOperationMaskForRemote; NSDragOperation _draggingSourceOperationMaskForRemote;

16
Headers/AppKit/NSCollectionViewItem.h
View file

@ -29,14 +29,16 @@
#ifndef _GNUstep_H_NSCollectionViewItem #ifndef _GNUstep_H_NSCollectionViewItem
#define _GNUstep_H_NSCollectionViewItem #define _GNUstep_H_NSCollectionViewItem
#import <AppKit/NSNibDeclarations.h>
#import <GNUstepBase/GSVersionMacros.h> #import <GNUstepBase/GSVersionMacros.h>
#import <AppKit/NSTextField.h> #import <Foundation/NSArray.h>
#import <AppKit/NSImageView.h>
#import <AppKit/NSView.h>
#import <AppKit/NSViewController.h>
#import <AppKit/NSCollectionView.h> #import <AppKit/NSCollectionView.h>
#import <AppKit/NSDragging.h> #import <AppKit/NSDragging.h>
#import <AppKit/NSImageView.h>
#import <AppKit/NSNibDeclarations.h>
#import <AppKit/NSTextField.h>
#import <AppKit/NSView.h>
#import <AppKit/NSViewController.h>
@interface NSCollectionViewItem : NSViewController @interface NSCollectionViewItem : NSViewController
@ -47,13 +49,15 @@
} }
- (NSCollectionView *)collectionView; - (NSCollectionView *)collectionView;
- (NSArray *)draggingImageComponents;
- (void)setSelected:(BOOL)shouldBeSelected; - (void)setSelected:(BOOL)shouldBeSelected;
- (BOOL)isSelected; - (BOOL)isSelected;
- (NSTextField *)textField; - (NSTextField *)textField;
- (NSImageView *)imageView;
- (void)setTextField:(NSTextField *)aTextField; - (void)setTextField:(NSTextField *)aTextField;
- (NSImageView *)imageView;
- (void)setImageView:(NSImageView *)anImageView; - (void)setImageView:(NSImageView *)anImageView;
@end @end

2
Source/GNUmakefile
View file

@ -68,6 +68,7 @@ NSCachedImageRep.m \
NSCell.m \ NSCell.m \
NSClipView.m \ NSClipView.m \
NSCollectionView.m \ NSCollectionView.m \
NSCollectionViewItem.m \
NSColor.m \ NSColor.m \
NSColorList.m \ NSColorList.m \
NSColorPanel.m \ NSColorPanel.m \
@ -280,6 +281,7 @@ NSCachedImageRep.h \
NSCell.h \ NSCell.h \
NSClipView.h \ NSClipView.h \
NSCollectionView.h \ NSCollectionView.h \
NSCollectionViewItem.h \
NSColor.h \ NSColor.h \
NSColorList.h \ NSColorList.h \
NSColorPanel.h \ NSColorPanel.h \

533
Source/NSCollectionView.m
View file

File diff suppressed because it is too large Load diff

109
Source/NSCollectionViewItem.m
View file

@ -25,99 +25,68 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#import "AppKit/NSCollectionViewItem.h" #import <Foundation/NSArray.h>
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSDebug.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSException.h>
#import <Foundation/NSFormatter.h>
#import <Foundation/NSIndexSet.h>
#import <Foundation/NSKeyValueCoding.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSSortDescriptor.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSKeyedArchiver.h> #import <Foundation/NSKeyedArchiver.h>
#import "AppKit/NSTableView.h" #import "AppKit/NSCollectionView.h"
#import "AppKit/NSApplication.h" #import "AppKit/NSCollectionViewItem.h"
#import "AppKit/NSCell.h" #import "AppKit/NSImageView.h"
#import "AppKit/NSClipView.h" #import "AppKit/NSTextField.h"
#import "AppKit/NSColor.h"
#import "AppKit/NSEvent.h"
#import "AppKit/NSImage.h"
#import "AppKit/NSGraphics.h"
#import "AppKit/NSKeyValueBinding.h"
#import "AppKit/NSScroller.h"
#import "AppKit/NSScrollView.h"
#import "AppKit/NSTableColumn.h"
#import "AppKit/NSTableHeaderView.h"
#import "AppKit/NSText.h"
#import "AppKit/NSTextFieldCell.h"
#import "AppKit/NSWindow.h"
#import "AppKit/PSOperators.h"
#import "AppKit/NSCachedImageRep.h"
#import "AppKit/NSPasteboard.h"
#import "AppKit/NSDragging.h"
#import "AppKit/NSCustomImageRep.h"
#import "AppKit/NSAttributedString.h"
#import "AppKit/NSStringDrawing.h"
#import "GNUstepGUI/GSTheme.h"
#import "GSBindingHelpers.h"
#include <math.h>
@implementation NSCollectionViewItem @implementation NSCollectionViewItem
- (void)awakeFromNib - (void) awakeFromNib
{ {
} }
- (BOOL)isSelected - (BOOL) isSelected
{ {
return _isSelected; return _isSelected;
} }
- (void)dealloc - (void) dealloc
{ {
DESTROY (textField); DESTROY(textField);
DESTROY (imageView); DESTROY(imageView);
[super dealloc]; [super dealloc];
} }
- (NSCollectionView *)collectionView - (NSCollectionView *) collectionView
{ {
return (NSCollectionView *)[[self view] superview]; return (NSCollectionView *)[[self view] superview];
} }
- (void)setSelected:(BOOL)flag - (NSArray *) draggingImageComponents
{
// FIXME: We don't have NSDraggingImageComponent
return [NSArray array];
}
- (void) setSelected: (BOOL)flag
{ {
if (_isSelected != flag) if (_isSelected != flag)
{ {
_isSelected = flag; _isSelected = flag;
} }
} }
- (id)representedObject - (id) representedObject
{ {
return [super representedObject]; return [super representedObject];
} }
- (void)setRepresentedObject:(id)anObject - (void) setRepresentedObject: (id)anObject
{ {
[super setRepresentedObject:anObject]; [super setRepresentedObject:anObject];
//[textField setStringValue:[self representedObject]]; //[textField setStringValue:[self representedObject]];
} }
- (NSTextField *)textField - (NSTextField *) textField
{ {
return textField; return textField;
} }
- (void)setTextField:(NSTextField *)aTextField - (void) setTextField: (NSTextField *)aTextField
{ {
if (textField != aTextField) if (textField != aTextField)
{ {
@ -125,12 +94,12 @@
} }
} }
- (NSImageView *)imageView - (NSImageView *) imageView
{ {
return imageView; return imageView;
} }
- (void)setImageView:(NSImageView *)anImageView - (void) setImageView: (NSImageView *)anImageView
{ {
if (imageView != anImageView) if (imageView != anImageView)
{ {
@ -138,15 +107,15 @@
} }
} }
- (id)initWithCoder:(NSCoder *)aCoder - (id) initWithCoder: (NSCoder *)aCoder
{ {
self = [super initWithCoder:aCoder]; self = [super initWithCoder: aCoder];
if (nil != self) if (nil != self)
{ {
if(YES == [aCoder allowsKeyedCoding]) if (YES == [aCoder allowsKeyedCoding])
{ {
textField = [aCoder decodeObjectForKey:@"textField"]; textField = [aCoder decodeObjectForKey: @"textField"];
imageView = [aCoder decodeObjectForKey:@"imageView"]; imageView = [aCoder decodeObjectForKey: @"imageView"];
} }
else else
{ {
@ -159,24 +128,24 @@
- (void)encodeWithCoder:(NSCoder *)aCoder - (void)encodeWithCoder:(NSCoder *)aCoder
{ {
[super encodeWithCoder:aCoder]; [super encodeWithCoder: aCoder];
if(YES == [aCoder allowsKeyedCoding]) if (YES == [aCoder allowsKeyedCoding])
{ {
[aCoder encodeObject:textField forKey:@"textField"]; [aCoder encodeObject: textField forKey: @"textField"];
[aCoder encodeObject:imageView forKey:@"imageView"]; [aCoder encodeObject: imageView forKey: @"imageView"];
} }
else else
{ {
[aCoder encodeObject:textField]; [aCoder encodeObject: textField];
[aCoder encodeObject:imageView] [aCoder encodeObject: imageView];
} }
} }
- (id) copyWithZone:(NSZone *)zone - (id) copyWithZone: (NSZone *)zone
{ {
NSData *itemAsData = [NSKeyedArchiver archivedDataWithRootObject:self]; NSData *itemAsData = [NSKeyedArchiver archivedDataWithRootObject: self];
NSCollectionViewItem *newItem = NSCollectionViewItem *newItem =
[NSKeyedUnarchiver unarchiveObjectWithData:itemAsData]; [NSKeyedUnarchiver unarchiveObjectWithData: itemAsData];
return newItem; return newItem;
} }

4
Source/NSTableView.m
View file

@ -2884,12 +2884,12 @@ byExtendingSelection: (BOOL)flag
- (NSIndexSet *) selectedColumnIndexes - (NSIndexSet *) selectedColumnIndexes
{ {
return _selectedColumns; return [[_selectedColumns copy] autorelease];
} }
- (NSIndexSet *) selectedRowIndexes - (NSIndexSet *) selectedRowIndexes
{ {
return _selectedRows; return [[_selectedRows copy] autorelease];
} }
- (void) deselectColumn: (NSInteger)columnIndex - (void) deselectColumn: (NSInteger)columnIndex