Skip to content

Commit

Permalink
Make multiple selection movable, laces can't be selected anymore, fix…
Browse files Browse the repository at this point in the history
…ed another bug on close with autosaved document, fixed selection behavior(shift, cmd), no more ordering of subviews on selection
  • Loading branch information
danielkleinert committed Aug 1, 2011
1 parent b395e98 commit 7f02d5f
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 302 deletions.
21 changes: 3 additions & 18 deletions EFLaceView.h
Expand Up @@ -19,10 +19,11 @@
{
NSObject* _dataObjectsContainer;
NSString* _dataObjectsKeyPath;

NSObject* _selectionIndexesContainer;
NSString* _selectionIndexesKeyPath;

NSMutableSet* selectedSubViews;

NSArray* _oldDataObjects;

BOOL _isMaking;
Expand All @@ -33,7 +34,6 @@
NSPoint _rubberEnd;
BOOL _isRubbing;

id _selectedLace;
id _startHole;
id _endHole;

Expand All @@ -44,21 +44,6 @@

}

#pragma mark -
#pragma mark *** containers ***

- (NSObject *)dataObjectsContainer;
- (void)setDataObjectsContainer:(NSObject *)aDataObjectsContainer;


- (NSObject *)selectionIndexesContainer;
- (void)setSelectionIndexesContainer:(NSObject *)aSelectionIndexesContainer;

- (NSString *)dataObjectsKeyPath;
- (void)setDataObjectsKeyPath:(NSString *)aDataObjectsKeyPath;

- (NSString *)selectionIndexesKeyPath;
- (void)setSelectionIndexesKeyPath:(NSString *)aSelectionIndexesKeyPath;

#pragma mark -
#pragma mark *** bindings ***
Expand Down Expand Up @@ -88,11 +73,11 @@

- (BOOL)isStartHole:(NSPoint)aPoint;
- (BOOL)isEndHole:(NSPoint)aPoint;
- (id)laceAtPoint:(NSPoint)aPoint;
- (void)drawLinkFrom:(NSPoint)startPoint to:(NSPoint)endPoint color:(NSColor *)insideColor;
- (void)deselectViews;
- (void)selectView:(EFView *)aView;
- (void)selectView:(EFView *)aView state:(BOOL)aBool;
- (NSSet*)selectedSubViews;

@end

Expand Down

0 comments on commit 7f02d5f

Please sign in to comment.