Huge audit of ITKit, mostly everything has been updated to current coding

[ITKit.git] / ITBevelView.m

diff --git a/ITBevelView.m b/ITBevelView.m
old mode 100755 (executable)
new mode 100644 (file)
index de94f3b..09cb89f
--- a/ITBevelView.m
+++ b/ITBevelView.m
@@ -1,112 +1,81 @@
 #import "ITBevelView.h"
 
-
 @implementation ITBevelView
 
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark INITIALIZATION METHODS
-/*************************************************************************/
-
-- (id)initWithFrame:(NSRect)frameRect
-{
-    if ( (self = [super initWithFrame:frameRect]) ) {
-        _bevelDepth = 5;
-        [self setAutoresizesSubviews:NO];
-    }
-    
-    return self;
+- (id)initWithFrame:(NSRect)frameRect {
+       if ((self = [super initWithFrame:frameRect])) {
+               _bevelDepth = 5;
+               [self setAutoresizesSubviews:NO];
+       }
+       return self;
 }
 
-- (id)initWithCoder:(NSCoder *)coder
-{
-    if ( ( self = [super initWithCoder:coder] ) ) {
-        _bevelDepth = 5;
-        [self setAutoresizesSubviews:NO];
-    }
-
-    return self;
+- (id)initWithCoder:(NSCoder *)coder {
+       if ((self = [super initWithCoder:coder])) {
+               _bevelDepth = 5;
+               [self setAutoresizesSubviews:NO];
+       }
+       return self;
 }
 
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark ACCESSOR METHODS
-/*************************************************************************/
-
-- (int)bevelDepth
-{
-    return _bevelDepth;
+- (int)bevelDepth {
+       return _bevelDepth;
 }
 
-- (void)setBevelDepth:(int)newDepth
-{
-    _bevelDepth = newDepth;
-    [self setNeedsDisplay:YES];
+- (void)setBevelDepth:(int)newDepth {
+       _bevelDepth = newDepth;
+       [self setNeedsDisplay:YES];
 }
 
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark INSTANCE METHODS
-/*************************************************************************/
-
-- (void)drawRect:(NSRect)aRect
-{
-        // Draw special bezel, with a thickness of _bevelDepth.
-    NSRect innerRect = NSMakeRect( (aRect.origin.x + _bevelDepth),
-                                   (aRect.origin.y + _bevelDepth),
-                                   (aRect.size.width  - (_bevelDepth * 2)),
-                                   (aRect.size.height - (_bevelDepth * 2)) );
-
-    NSBezierPath *leftEdge   = [NSBezierPath bezierPath];
-    NSBezierPath *topEdge    = [NSBezierPath bezierPath];
-    NSBezierPath *rightEdge  = [NSBezierPath bezierPath];
-    NSBezierPath *bottomEdge = [NSBezierPath bezierPath];
-
-    [[[self subviews] objectAtIndex:0] setFrame:innerRect];
-
-    [leftEdge moveToPoint:aRect.origin];
-    [leftEdge lineToPoint:NSMakePoint(aRect.origin.x, aRect.size.height)];
-    [leftEdge lineToPoint:NSMakePoint( (aRect.origin.x + _bevelDepth), (aRect.size.height - _bevelDepth) )];
-    [leftEdge lineToPoint:NSMakePoint( (aRect.origin.x + _bevelDepth), (aRect.origin.y + _bevelDepth) )];
-
-    [topEdge moveToPoint:NSMakePoint(aRect.origin.x, aRect.size.height)];
-    [topEdge lineToPoint:NSMakePoint(aRect.size.width, aRect.size.height)];
-    [topEdge lineToPoint:NSMakePoint( (aRect.size.width - _bevelDepth), (aRect.size.height - _bevelDepth) )];
-    [topEdge lineToPoint:NSMakePoint( (aRect.origin.x + _bevelDepth), (aRect.size.height - _bevelDepth) )];
-
-    [rightEdge moveToPoint:NSMakePoint(aRect.size.width, aRect.origin.y)];
-    [rightEdge lineToPoint:NSMakePoint(aRect.size.width, aRect.size.height)];
-    [rightEdge lineToPoint:NSMakePoint( (aRect.size.width - _bevelDepth), (aRect.size.height - _bevelDepth) )];
-    [rightEdge lineToPoint:NSMakePoint( (aRect.size.width - _bevelDepth), (_bevelDepth) )];
-
-    [bottomEdge moveToPoint:aRect.origin];
-    [bottomEdge lineToPoint:NSMakePoint(aRect.size.width, aRect.origin.y)];
-    [bottomEdge lineToPoint:NSMakePoint( (aRect.size.width - _bevelDepth), (_bevelDepth) )];
-    [bottomEdge lineToPoint:NSMakePoint( (aRect.origin.x + _bevelDepth), (aRect.origin.y + _bevelDepth) )];
-
-    [[NSColor colorWithCalibratedWhite:0.5 alpha:0.5] set];
-    [leftEdge fill];
-    [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
-    [topEdge fill];
-    [[NSColor colorWithCalibratedWhite:0.5 alpha:0.5] set];
-    [rightEdge fill];
-    [[NSColor colorWithCalibratedWhite:1.0 alpha:0.6] set];
-    [bottomEdge fill];
+- (void)drawRect:(NSRect)aRect {
+       NSRect frameRect = [self convertRect:[self frame] fromView:[self superview]];
+       NSRect innerRect = NSMakeRect((frameRect.origin.x + _bevelDepth), (frameRect.origin.y + _bevelDepth), (frameRect.size.width - (_bevelDepth * 2)), (frameRect.size.height - (_bevelDepth * 2)));
+
+       NSBezierPath *leftEdge = [NSBezierPath bezierPath];
+       NSBezierPath *topEdge = [NSBezierPath bezierPath];
+       NSBezierPath *rightEdge = [NSBezierPath bezierPath];
+       NSBezierPath *bottomEdge = [NSBezierPath bezierPath];
+
+       [[[self subviews] objectAtIndex:0] setFrame:innerRect];
+
+       [leftEdge moveToPoint:frameRect.origin];
+       [leftEdge lineToPoint:NSMakePoint(frameRect.origin.x, frameRect.size.height)];
+       [leftEdge lineToPoint:NSMakePoint((frameRect.origin.x + _bevelDepth), (frameRect.size.height - _bevelDepth))];
+       [leftEdge lineToPoint:NSMakePoint((frameRect.origin.x + _bevelDepth), (frameRect.origin.y + _bevelDepth))];
+
+       [topEdge moveToPoint:NSMakePoint(frameRect.origin.x, frameRect.size.height)];
+       [topEdge lineToPoint:NSMakePoint(frameRect.size.width, frameRect.size.height)];
+       [topEdge lineToPoint:NSMakePoint((frameRect.size.width - _bevelDepth), (frameRect.size.height - _bevelDepth))];
+       [topEdge lineToPoint:NSMakePoint((frameRect.origin.x + _bevelDepth), (frameRect.size.height - _bevelDepth))];
+
+       [rightEdge moveToPoint:NSMakePoint(frameRect.size.width, frameRect.origin.y)];
+       [rightEdge lineToPoint:NSMakePoint(frameRect.size.width, frameRect.size.height)];
+       [rightEdge lineToPoint:NSMakePoint((frameRect.size.width - _bevelDepth), (frameRect.size.height - _bevelDepth))];
+       [rightEdge lineToPoint:NSMakePoint((frameRect.size.width - _bevelDepth), _bevelDepth)];
+
+       [bottomEdge moveToPoint:frameRect.origin];
+       [bottomEdge lineToPoint:NSMakePoint(frameRect.size.width, frameRect.origin.y)];
+       [bottomEdge lineToPoint:NSMakePoint((frameRect.size.width - _bevelDepth), _bevelDepth)];
+       [bottomEdge lineToPoint:NSMakePoint((frameRect.origin.x + _bevelDepth), (frameRect.origin.y + _bevelDepth))];
+
+       [[NSColor colorWithCalibratedWhite:0.5 alpha:0.5] set];
+       [leftEdge fill];
+       [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
+       [topEdge fill];
+       [[NSColor colorWithCalibratedWhite:0.5 alpha:0.5] set];
+       [rightEdge fill];
+       [[NSColor colorWithCalibratedWhite:1.0 alpha:0.6] set];
+       [bottomEdge fill];
+
+       [[[self subviews] objectAtIndex:0] setNeedsDisplay:YES];
 }
 
+- (BOOL)mouseDownCanMoveWindow {
+       return NO;
+}
 
-/*************************************************************************/
-#pragma mark -
-#pragma mark DEALLOCATION METHOD
-/*************************************************************************/
-
-- (void)dealloc
-{
+- (void)dealloc {
        [super dealloc];
 }
 
-
-@end
+@end
\ No newline at end of file