From e51c739bfc8e0c50161172952c99b8796703c6fe Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Mon, 5 Jun 2017 12:43:11 +0200 Subject: Start modernising ObjC --- frontends/cocoa/TreeView.m | 93 ++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 48 deletions(-) (limited to 'frontends/cocoa/TreeView.m') diff --git a/frontends/cocoa/TreeView.m b/frontends/cocoa/TreeView.m index a00e48fd3..8fe3767fb 100644 --- a/frontends/cocoa/TreeView.m +++ b/frontends/cocoa/TreeView.m @@ -26,15 +26,17 @@ #import "Tree.h" @interface TreeView () + +@property (nonatomic) BOOL isDragging; +@property (nonatomic) CGPoint dragStart; + @end @implementation TreeView -@synthesize tree; - - (void)drawRect:(NSRect)dirtyRect { - [tree drawRect:dirtyRect inView:self]; + [self.tree drawRect:dirtyRect inView:self]; } - (BOOL)isFlipped @@ -47,20 +49,15 @@ return YES; } -- (void)dealloc -{ - [self setTree:nil]; -} - - (void)setTree:(Tree *)newTree { - if (tree != newTree) { - [tree setRedrawing:NO]; - [tree setDelegate:nil]; + if (_tree != newTree) { + _tree.redrawing = NO; + _tree.delegate = nil; - tree = newTree; - [tree setDelegate:self]; - [tree setRedrawing:YES]; + _tree = newTree; + _tree.delegate = self; + _tree.redrawing = YES; [self setNeedsDisplay:YES]; } @@ -71,9 +68,9 @@ - (void)mouseDown:(NSEvent *)event { - isDragging = NO; - dragStart = [self convertPoint:[event locationInWindow] fromView:nil]; - [tree mouseAction:BROWSER_MOUSE_PRESS_1 atPoint:dragStart]; + self.isDragging = NO; + self.dragStart = [self convertPoint:[event locationInWindow] fromView:nil]; + [self.tree mouseAction:BROWSER_MOUSE_PRESS_1 atPoint:self.dragStart]; } #define squared(x) ((x) * (x)) @@ -83,10 +80,10 @@ { const NSPoint point = [self convertPoint:[event locationInWindow] fromView:nil]; - if (!isDragging) { - const CGFloat distance = squared(dragStart.x - point.x) + squared(dragStart.y - point.y); + if (!self.isDragging) { + const CGFloat distance = squared(self.dragStart.x - point.x) + squared(self.dragStart.y - point.y); if (distance >= squared(MinDragDistance)) { - isDragging = YES; + self.isDragging = YES; } } } @@ -97,15 +94,15 @@ browser_mouse_state modifierFlags = 0; - if (isDragging) { - isDragging = NO; - [tree mouseDragEnd:modifierFlags fromPoint:dragStart toPoint:point]; + if (self.isDragging) { + self.isDragging = NO; + [self.tree mouseDragEnd:modifierFlags fromPoint:self.dragStart toPoint:point]; } else { modifierFlags |= BROWSER_MOUSE_CLICK_1; if ([event clickCount] == 2) { modifierFlags |= BROWSER_MOUSE_DOUBLE_CLICK; } - [tree mouseAction:modifierFlags atPoint:point]; + [self.tree mouseAction:modifierFlags atPoint:point]; } } @@ -113,115 +110,115 @@ - (void)keyDown:(NSEvent *)theEvent { - [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]]; + [self interpretKeyEvents:@[ theEvent ]]; } - (void)insertText:(id)string { for (NSUInteger i = 0, length = [string length]; i < length; i++) { unichar ch = [string characterAtIndex:i]; - [tree keyPress:ch]; + [self.tree keyPress:ch]; } } - (void)moveLeft:(id)sender { - [tree keyPress:NS_KEY_LEFT]; + [self.tree keyPress:NS_KEY_LEFT]; } - (void)moveRight:(id)sender { - [tree keyPress:NS_KEY_RIGHT]; + [self.tree keyPress:NS_KEY_RIGHT]; } - (void)moveUp:(id)sender { - [tree keyPress:NS_KEY_UP]; + [self.tree keyPress:NS_KEY_UP]; } - (void)moveDown:(id)sender { - [tree keyPress:NS_KEY_DOWN]; + [self.tree keyPress:NS_KEY_DOWN]; } - (void)deleteBackward:(id)sender { - [tree keyPress:NS_KEY_DELETE_LEFT]; + [self.tree keyPress:NS_KEY_DELETE_LEFT]; } - (void)deleteForward:(id)sender { - [tree keyPress:NS_KEY_DELETE_RIGHT]; + [self.tree keyPress:NS_KEY_DELETE_RIGHT]; } - (void)cancelOperation:(id)sender { - [tree keyPress:NS_KEY_ESCAPE]; + [self.tree keyPress:NS_KEY_ESCAPE]; } - (void)scrollPageUp:(id)sender { - [tree keyPress:NS_KEY_PAGE_UP]; + [self.tree keyPress:NS_KEY_PAGE_UP]; } - (void)scrollPageDown:(id)sender { - [tree keyPress:NS_KEY_PAGE_DOWN]; + [self.tree keyPress:NS_KEY_PAGE_DOWN]; } - (void)insertTab:(id)sender { - [tree keyPress:NS_KEY_TAB]; + [self.tree keyPress:NS_KEY_TAB]; } - (void)insertBacktab:(id)sender { - [tree keyPress:NS_KEY_SHIFT_TAB]; + [self.tree keyPress:NS_KEY_SHIFT_TAB]; } - (void)moveToBeginningOfLine:(id)sender { - [tree keyPress:NS_KEY_LINE_START]; + [self.tree keyPress:NS_KEY_LINE_START]; } - (void)moveToEndOfLine:(id)sender { - [tree keyPress:NS_KEY_LINE_END]; + [self.tree keyPress:NS_KEY_LINE_END]; } - (void)moveToBeginningOfDocument:(id)sender { - [tree keyPress:NS_KEY_TEXT_START]; + [self.tree keyPress:NS_KEY_TEXT_START]; } - (void)moveToEndOfDocument:(id)sender { - [tree keyPress:NS_KEY_TEXT_END]; + [self.tree keyPress:NS_KEY_TEXT_END]; } - (void)insertNewline:(id)sender { - [tree keyPress:NS_KEY_NL]; + [self.tree keyPress:NS_KEY_NL]; } - (void)selectAll:(id)sender { - [tree keyPress:NS_KEY_SELECT_ALL]; + [self.tree keyPress:NS_KEY_SELECT_ALL]; } - (void)copy:(id)sender { - [tree keyPress:NS_KEY_COPY_SELECTION]; + [self.tree keyPress:NS_KEY_COPY_SELECTION]; } - (void)cut:(id)sender { - [tree keyPress:NS_KEY_CUT_SELECTION]; + [self.tree keyPress:NS_KEY_CUT_SELECTION]; } - (void)paste:(id)sender { - [tree keyPress:NS_KEY_PASTE]; + [self.tree keyPress:NS_KEY_PASTE]; } //MARK: - @@ -234,7 +231,7 @@ - (void)tree:(Tree *)t resized:(NSSize)size { - [self setMinimumSize:size]; + self.minimumSize = size; } - (void)tree:(Tree *)t scrollPoint:(NSPoint)point @@ -244,7 +241,7 @@ - (NSSize)treeWindowSize:(Tree *)t { - return [self frame].size; + return self.frame.size; } @end -- cgit v1.2.3