new badge

Author: laullon

PBGitSidebarController.m

@@ -223,8 +223,13 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView isGroupItem:(id)item
 
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(PBSourceViewCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(PBSourceViewItem *)item
 {
-	cell.isCheckedOut = [item.revSpecifier isEqual:[repository headRef]];
-
+	NSLog(@"%@ -- %d",item.revSpecifier,(item.revSpecifier!=NULL));
+	if(item.revSpecifier!=NULL){
+		cell.isCheckedOut = [item.revSpecifier isEqual:[repository headRef]];
+		cell.behind=[NSNumber numberWithInt:10];
+	}else{
+		cell.behind=nil;
+	}
 	[cell setImage:[item icon]];
 }
 

PBSourceViewCell.h

@@ -12,8 +12,10 @@
 
 @interface PBSourceViewCell : PBIconAndTextCell {
 	BOOL isCheckedOut;
+	NSNumber *behind;
 }
 
 @property (assign) BOOL isCheckedOut;
+@property (assign) NSNumber *behind;
 
 @end

PBSourceViewCell.m

@@ -16,16 +16,17 @@
 @implementation PBSourceViewCell
 
 @synthesize isCheckedOut;
+@synthesize behind;
 
 # pragma mark context menu delegate methods
 
 - (NSMenu *) menuForEvent:(NSEvent *)event inRect:(NSRect)rect ofView:(NSOutlineView *)view
 {
 	NSPoint point = [view convertPoint:[event locationInWindow] fromView:nil];
 	NSInteger row = [view rowAtPoint:point];
-
+	
 	PBGitSidebarController *controller = [view delegate];
-
+	
 	return [controller menuForRow:row];
 }
 
@@ -34,21 +35,21 @@ - (NSMenu *) menuForEvent:(NSEvent *)event inRect:(NSRect)rect ofView:(NSOutline
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)outlineView
 {
-	if (isCheckedOut) {
-		NSImage *checkedOutImage = [PBSourceViewBadge checkedOutBadgeForCell:self];
+	if(behind){
+		NSImage *checkedOutImage = [PBSourceViewBadge badge:[NSString stringWithFormat:@"%@-%@",(isCheckedOut?@"✔ ":@""),behind] forCell:self];
 		NSSize imageSize = [checkedOutImage size];
 		NSRect imageFrame;
 		NSDivideRect(cellFrame, &imageFrame, &cellFrame, imageSize.width + 3, NSMaxXEdge);
 		imageFrame.size = imageSize;
-
+		
 		if ([outlineView isFlipped])
 			imageFrame.origin.y += floor((cellFrame.size.height + imageFrame.size.height) / 2);
 		else
 			imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
-
+		
 		[checkedOutImage compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver];
 	}
-
+	
 	[super drawWithFrame:cellFrame inView:outlineView];
 }