Changeset 2558 for trunk/AICustomTabCell.m

Timestamp:

04/20/05 19:37:46 (4 years ago)

Author:

eridius

Message:

Remove all trailing whitespace from lines
Remove indentation on blank lines

Files:

• trunk/AICustomTabCell.m (modified) (22 diffs)

trunk/AICustomTabCell.m

@@ -58 +58 @@
-{
-    static BOOL haveLoadedImages = NO;
-
+
-    [super init];
-
+
-    //Share these images between all AICustomTabCell instances
-    if(!haveLoadedImages){
@@ -66 +66 @@
-                tabFrontMiddle = [[NSImage imageNamed:@"aquaTabMiddle"] retain];
-                tabFrontRight = [[NSImage imageNamed:@"aquaTabRight"] retain];
-
+
-                tabCloseFront = [[NSImage imageNamed:@"aquaTabClose"] retain];
-                tabCloseBack = [[NSImage imageNamed:@"aquaTabCloseBack"] retain];
@@ -74 +74 @@
-                leftCapSize = [tabFrontLeft size];
-                rightCapSize = [tabFrontRight size];
-
+
-        haveLoadedImages = YES;
-    }
-
+
-    tabViewItem = [inTabViewItem retain];
-        view = inView;
@@ -88 +88 @@
-    closeTrackingTag = 0;
-        toolTipTag = 0;
-
+
-    return(self);
-}
@@ -106 +106 @@
-        int width = leftCapSize.width + [[self attributedLabel] size].width + rightCapSize.width +
-        (TAB_CLOSE_LEFTPAD + [[tabViewItem icon] size].width + TAB_CLOSE_RIGHTPAD) + TAB_RIGHT_PAD;
-
+
-    return( NSMakeSize((width > TAB_MIN_WIDTH ? width : TAB_MIN_WIDTH), leftCapSize.height) );
-}
@@ -115 +115 @@
-    int tabWidth = [tab size].width;
-    int ourWidth = [self size].width;
-
+
-    if(tabWidth > ourWidth){
-        return(NSOrderedAscending);
-
+
-    }else if(tabWidth < ourWidth){
-        return(NSOrderedDescending);
-
+
-    }else{
-        return(NSOrderedSame);
-
+
-    }
-}
@@ -152 +152 @@
-        NSSize  imageSize = [[tabViewItem icon] size];
-        int             centerY = (frame.size.height - imageSize.height) / 2.0;
-
+
-        return(NSMakeRect(frame.origin.x + leftCapSize.width + TAB_CLOSE_LEFTPAD,
-                                          frame.origin.y + centerY + TAB_CLOSE_Y_OFFSET,
@@ -226 +226 @@
-    NSSize      labelSize;
-        NSPoint destPoint;
-
+
-    //Pre-calc some dimensions
-    labelSize = [tabViewItem sizeOfLabel:NO];
@@ -232 +232 @@
-    middleRightEdge = (rect.origin.x + rect.size.width - rightCapSize.width);
-    middleLeftEdge = (rect.origin.x + leftCapSize.width);
-
+
-    //Background
-    if(selected && !ignoreSelection){
-        //Draw the left cap
-        [tabFrontLeft compositeToPoint:NSMakePoint(rect.origin.x, rect.origin.y) operation:NSCompositeSourceOver];
-
+
-        //Draw the middle
-        sourceRect = NSMakeRect(0, 0, [tabFrontMiddle size].width, [tabFrontMiddle size].height);
-        destRect = NSMakeRect(middleLeftEdge, rect.origin.y, sourceRect.size.width, sourceRect.size.height);
-
+
-        while(destRect.origin.x < middleRightEdge){
-            if((destRect.origin.x + destRect.size.width) > middleRightEdge){
@@ -249 +249 @@
-            destRect.origin.x += destRect.size.width;
-        }
-
+
-        //Draw the right cap
-        [tabFrontRight compositeToPoint:NSMakePoint(middleRightEdge, rect.origin.y) operation:NSCompositeSourceOver];
-
+
-    }else if(highlighted){
-        [[NSColor colorWithCalibratedWhite:0.0 alpha:0.1] set];
-        [NSBezierPath fillRect:NSMakeRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height)];
-    }
-
+
-        //We'll display our close icon if the user is hovering.  Otherwise, we display the tab specified icon
-        NSImage *leftIcon = [tabViewItem icon];
-         
+
-                if(hoveringClose){
-                        leftIcon = (trackingClose ? tabCloseFrontPressed : tabCloseFrontRollover);
@@ -278 +278 @@
-        rect.origin.x += offsetX;
-        rect.size.width -= offsetX + TAB_RIGHT_PAD;
-
+
-        //Draw our label
-        destRect = NSMakeRect(rect.origin.x,
@@ -285 +285 @@
-                                                  rect.size.height - ((rect.size.height - labelSize.height) / 2.0));
-    if(TAB_SELECTED_HIGHER && !ignoreSelection && selected) destRect.origin.y += 1.0;
-  
+
-}
-
@@ -292 +292 @@
-{
-        NSString        *label = [tabViewItem label];
-
+
-        if(![label isEqualToString:[attributedLabel string]] || wasEnabled != [tabViewItem isEnabled] ){
-                wasEnabled = [tabViewItem isEnabled];
@@ -299 +299 @@
-                [paragraphStyle setAlignment:NSCenterTextAlignment];
-                [paragraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
-
+
-                //Update the attributed string
-                [attributedLabel release];
@@ -309 +309 @@
-                                nil]];
-        }
-
+
-        return(attributedLabel);
-}
@@ -324 +324 @@
-                           assumeInside:NSPointInRect(cursorLocation, trackRect)];
-    [self setHighlighted:NSPointInRect(cursorLocation, trackRect)];
-
+
-    closeTrackingTag = [view addTrackingRect:[self _closeButtonRect]
-                                       owner:self
@@ -349 +349 @@
-//              [[tabViewItem tabView] selectTabViewItem:tabViewItem];
-//      }
-
+
-    //Set ourself (or our close button) as hovered
-    if((allowsInactiveTabClosing || selected || ( [[[NSApplication sharedApplication] currentEvent] modifierFlags] & NSCommandKeyMask )) &&
@@ -378 +378 @@
-           (SHOW_CLOSE_BUTTON_FOR_SINGLE_TAB || [[tabViewItem tabView] numberOfTabViewItems] != 1) &&
-           NSPointInRect([controlView convertPoint:[theEvent locationInWindow] fromView:nil], [self _closeButtonRect])){
-
+
-        [self trackMouse:theEvent inRect:[self _closeButtonRect] ofView:controlView untilMouseUp:YES];
-        return(YES);
-
+
-    }else{
-        return(NO);
-
+
-    }
-}
@@ -394 +394 @@
-    hoveringClose = YES;
-    [controlView setNeedsDisplayInRect:[self _closeButtonRect]];
-
+
-    return(YES);
-}
@@ -402 +402 @@
-{
-    BOOL        hovering = NSPointInRect(currentPoint, [self _closeButtonRect]);
-
+
-    if(hoveringClose != hovering){
-        hoveringClose = hovering;
-        [controlView setNeedsDisplayInRect:[self _closeButtonRect]];
-    }
-
+
-    return(YES);
-}
@@ -415 +415 @@
-{
-    BOOL        hovering = NSPointInRect(stopPoint, [self _closeButtonRect]);
-
+
-        //Closes all the other tabs in the current window if option is held down (And we have more than one tab)
-        if(hovering && ([[[controlView window] currentEvent] modifierFlags] & NSAlternateKeyMask) && [[tabViewItem tabView] numberOfTabViewItems] > 1){
@@ -422 +422 @@
-        [(AICustomTabsView *)controlView closeTab:self];
-    }
-
+
-    hoveringClose = NO;
-    trackingClose = NO;