Inactive state for tabs. And etched text.

Shared/ADLTabController.h

@@ -50,6 +50,7 @@
 @property (retain, readonly, nonatomic) id <ADLViewManipulator> viewManipulator;
 
 - (id <ADLTabView>)makeTabViewForTabController:(ADLTabController*)tabController;
+- (id <ADLView>)shadowView;
 - (void)updateSizeForContentWidth:(CGFloat)width;
 - (void)animateInTabView:(id <ADLTabView>)tabView;
 - (void)animateOutTabView:(id <ADLTabView>)tabView;

Shared/ADLTabController.m

@@ -13,6 +13,8 @@
 #import "ADLTabView.h"
 #import "ADLViewManipulator.h"
 
+static CGFloat kADLTabInset = 3;
+
 @interface ADLTabController ()
 
 @property (assign, nonatomic) id <ADLTabControllerDelegate> delegate;
@@ -78,6 +80,7 @@ - (void)setSelectedInfo:(id)selectedInfo {
         [mSelectedInfo release];
         mSelectedInfo = selectedInfo;
         [self.delegate makeTabVisible:tab];
+        [self layoutSubviewsNotAnimating:[NSArray array]];
     }
 }
 
@@ -171,6 +174,7 @@ - (void)setTabInfos:(NSArray *)tabInfos {
 }
 
 - (void)layoutSubviewsNotAnimating:(NSArray*)immediateTabs {
+    id <ADLView> shadowView = [self.delegate shadowView];
     CGFloat accumulatedWidth = 0;
     id <ADLViewManipulator> viewManipulator = self.delegate.viewManipulator;
     NSArray* tabs = self.currentlyDraggingTab != nil ? self.reorderedTabs : self.tabs;
@@ -188,16 +192,16 @@ - (void)layoutSubviewsNotAnimating:(NSArray*)immediateTabs {
             }
         }
         [viewManipulator orderViewFront:tabView];
-        accumulatedWidth += frame.size.width - 15;
+        accumulatedWidth += frame.size.width - kADLTabInset;
     }
+    [shadowView removeFromSuperview];
+    [viewManipulator addSubview:shadowView toView:self.delegate.bodyView];
+    [viewManipulator orderViewFront:self.selectedTab];
     if(self.currentlyDraggingTab == nil) {
-        [viewManipulator orderViewFront:self.selectedTab];
-    }
-    else {
         [viewManipulator orderViewFront:self.currentlyDraggingTab];
     }
 
-    [self.delegate updateSizeForContentWidth:accumulatedWidth + 15];
+    [self.delegate updateSizeForContentWidth:accumulatedWidth + kADLTabInset];
 }
 
 - (void)layoutSubviews {
@@ -236,7 +240,7 @@ - (void)draggedTab:(id <ADLTabView>)tab toParentLocation:(CGFloat)xLocation with
 
     for(id <ADLTabView> currentTab in self.reorderedTabs) {
         CGRect currentFrame = [viewManipulator frameOfView:currentTab];
-        currentFrame = CGRectInset(currentFrame, 15, 0);
+        currentFrame = CGRectInset(currentFrame, kADLTabInset, 0);
         if(currentTab != tab && CGRectContainsPoint(currentFrame, CGPointMake(xLocation, CGRectGetMidY(currentFrame)))) {
             newTabOrder = [[self.reorderedTabs mutableCopy] autorelease];
             [newTabOrder removeObject:currentTab];

julep-mac/ADLDocumentViewController.m

@@ -84,13 +84,13 @@ - (void)viewDidLoad {
 
     self.agnostic.tabController.selectedInfo = self.agnostic.modelAccess.selectedListID;
 
-    NSRect shadowFrame = NSInsetRect(self.tabController.view.frame, 0, -5);
-    ADLShadowView* tabShadow = [[ADLShadowView alloc] initWithFrame:shadowFrame];
-    tabShadow.autoresizingMask = NSViewWidthSizable | NSViewMinYMargin;
-    tabShadow.shadow = [NSShadow standardShadow];
-    tabShadow.insets = NSEdgeInsetsMake(5, 0, 5, 0);
-    [self.view addSubview:tabShadow positioned:NSWindowBelow relativeTo:self.tabController.view];
-    [tabShadow release];
+//    NSRect shadowFrame = NSInsetRect(self.tabController.view.frame, 0, -5);
+//    ADLShadowView* tabShadow = [[ADLShadowView alloc] initWithFrame:shadowFrame];
+//    tabShadow.autoresizingMask = NSViewWidthSizable | NSViewMinYMargin;
+//    tabShadow.shadow = [NSShadow standardShadow];
+//    tabShadow.insets = NSEdgeInsetsMake(5, 0, 5, 0);
+//    [self.view addSubview:tabShadow positioned:NSWindowBelow relativeTo:self.tabController.view];
+//    [tabShadow release];
 
     [self updateActivePileViewsForSelection:self.agnostic.selectedListID];
 }

julep-mac/ADLListViewController.m

@@ -55,6 +55,7 @@ - (void)viewDidLoad {
     scrollView.horizontalScrollElasticity = NSScrollElasticityNone;
     scrollView.contentView.copiesOnScroll = NO;
     scrollView.usesPredominantAxisScrolling = YES;
+    scrollView.backgroundColor = [NSColor colorWithDeviceWhite:227./255. alpha:1.];
 
     [self.view addSubview:scrollView];
 
@@ -63,7 +64,7 @@ - (void)viewDidLoad {
     tableView.dataSource = self;
     tableView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
     tableView.headerView = nil;
-    tableView.usesAlternatingRowBackgroundColors = YES;
+    tableView.backgroundColor = [NSColor clearColor];
     tableView.allowsMultipleSelection = YES;
     tableView.focusRingType = NSFocusRingTypeNone;
     tableView.doubleAction = @selector(cellDoubleClicked:);

julep-mac/ADLNSTabView.m

@@ -51,20 +51,24 @@ - (id)initWithFrame:(NSRect)frame
         [self updateAppearance];
         [self addSubview:self.backgroundView];
 
-        self.titleView = [[[NSTextField alloc] initWithFrame:NSInsetRect(self.bounds, 8, 4)] autorelease];
+        self.titleView = [[[NSTextField alloc] initWithFrame:NSInsetRect(self.bounds, 8, 6)] autorelease];
         self.titleView.bezeled = NO;
         self.titleView.backgroundColor = [NSColor clearColor];
         self.titleView.alignment = NSCenterTextAlignment;
         self.titleView.delegate = self;
         self.titleView.editable = YES;
         self.titleView.selectable = NO;
         [self addSubview:self.titleView];
+
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateAppearance) name:NSApplicationDidResignActiveNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateAppearance) name:NSApplicationDidBecomeActiveNotification object:nil];
     }
 
     return self;
 }
 
 - (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
     self.backgroundView = nil;
     self.titleView = nil;
     self.delegate = nil;
@@ -79,7 +83,19 @@ - (void)setTitle:(NSString *)newTitle {
     [mTitle release];
     mTitle = temp;
 
-    self.titleView.stringValue = newTitle;
+    NSMutableAttributedString* shadowTitle = [[NSMutableAttributedString alloc] initWithString:newTitle];
+    NSShadow* shadow = [[NSShadow alloc] init];
+    shadow.shadowColor = [NSColor colorWithDeviceWhite:1. alpha:.5];
+    shadow.shadowOffset = NSMakeSize(0, -1);
+    shadow.shadowBlurRadius = 1;
+    NSDictionary* shadowProperties = [NSDictionary dictionaryWithObject:shadow forKey:NSShadowAttributeName];
+    [shadowTitle setAttributes:shadowProperties range:NSMakeRange(0, shadowTitle.length)];
+    [shadowTitle setAlignment:NSCenterTextAlignment range:NSMakeRange(0, shadowTitle.length)];
+
+    self.titleView.attributedStringValue = shadowTitle;
+
+    [shadow release];
+    [shadowTitle release];
 }
 
 - (void)setSelected:(BOOL)selected {
@@ -90,11 +106,24 @@ - (void)setSelected:(BOOL)selected {
 }
 
 - (void)updateAppearance {
-    if(self.selected) {
-        self.backgroundView.image = [NSImage imageNamed:@"ADLTabSelected"];
+    BOOL active = [[NSApplication sharedApplication] isActive];
+    if(active) {
+        self.titleView.textColor = [NSColor blackColor];
+        if(self.selected) {
+            self.backgroundView.image = [NSImage imageNamed:@"ADLTabSelected"];
+        }
+        else {
+            self.backgroundView.image = [NSImage imageNamed:@"ADLTabUnselected"];
+        }
     }
     else {
-        self.backgroundView.image = [NSImage imageNamed:@"ADLTabUnselected"];
+        self.titleView.textColor = [NSColor colorWithDeviceWhite:110./255. alpha:1.];
+        if(self.selected) {
+            self.backgroundView.image = [NSImage imageNamed:@"ADLTabSelectedInactive"];
+        }
+        else {
+            self.backgroundView.image = [NSImage imageNamed:@"ADLTabUnselectedInactive"];
+        }
     }
 }
 

julep-mac/ADLNSTabViewController.m

@@ -10,7 +10,9 @@
 
 #import "ADLNSTabView.h"
 #import "ADLNSScrollView.h"
+#import "ADLShadowView.h"
 #import "ADLViewManipulator.h"
+#import "NSShadow+ADLExtensions.h"
 
 @interface ADLNSTabViewController ()
 
@@ -20,14 +22,27 @@ @interface ADLNSTabViewController ()
 
 @end
 
-const static CGFloat kADLNSTabWidth = 181;
-const static CGFloat kADLNSTabHeight = 28.;
+const static CGFloat kADLNSTabWidth = 149.;
+const static CGFloat kADLNSTabHeight = 29.;
+
+@interface ADLNSTabViewController ()
+
+@property (retain, nonatomic) id <ADLView> shadowView;
+
+@end
+
+@interface ADLNSTabViewController (ADLCast)
+
+@property (retain, nonatomic) ADLShadowView* shadowView;
+
+@end
 
 @implementation ADLNSTabViewController
 
 @synthesize scrollView = mScrollView;
 @synthesize bodyView = mBodyView;
 @synthesize agnostic = mAgnostic;
+@synthesize shadowView = mShadowView;
 @synthesize viewManipulator = mViewManipulator;
 
 - (id)initWithDataSource:(id <ADLTabControllerDataSource>)dataSource {
@@ -41,10 +56,35 @@ - (id)initWithDataSource:(id <ADLTabControllerDataSource>)dataSource {
 
 - (void)dealloc {
     self.agnostic = nil;
+    self.scrollView = nil;
+    self.bodyView = nil;
+    self.shadowView = nil;
+    self.viewManipulator = nil;
 
     [super dealloc];
 }
 
+- (void)viewDidLoad {
+    NSRect bodyFrame = self.bodyView.frame;
+    NSRect shadowFrame = NSMakeRect(0, -5, bodyFrame.size.width, 10);
+    ADLShadowView* shadowView = [[[ADLShadowView alloc] initWithFrame:shadowFrame] autorelease];
+    shadowView.autoresizingMask = NSViewMaxYMargin | NSViewWidthSizable;
+    shadowView.shadow = [NSShadow standardShadow];
+    shadowView.shadow.shadowBlurRadius = 2;
+    shadowView.shadow.shadowColor = [NSColor colorWithDeviceWhite:0 alpha:.2];
+
+    shadowView.insets = NSEdgeInsetsMake(5, 0, 0, 0);
+    self.shadowView = (id <ADLView>)shadowView;
+    self.scrollView.hasHorizontalScroller = YES;
+    self.scrollView.horizontalScroller.hidden = YES;
+
+}
+
+- (void)loadView {
+    [super loadView];
+    [self viewDidLoad];
+}
+
 - (NSView*)makeTabViewForTabController:(ADLTabController*)tabController {
     ADLNSTabView* tabView = [[ADLNSTabView alloc] initWithFrame:NSMakeRect(0, 0, kADLNSTabWidth, kADLNSTabHeight)];
 

julep.xcodeproj/project.pbxproj

@@ -43,6 +43,8 @@
 		7754A8B41448EBAE00DBE182 /* ADLList.m in Sources */ = {isa = PBXBuildFile; fileRef = 7754A8B21448EBAE00DBE182 /* ADLList.m */; };
 		7754A8B81448EBAF00DBE182 /* ADLListCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 7754A8B61448EBAF00DBE182 /* ADLListCollection.m */; };
 		7754A8BC1448ECBB00DBE182 /* CalCalendarStore+ADLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7754A8BA1448ECBB00DBE182 /* CalCalendarStore+ADLAdditions.m */; };
+		775BB94514C6706900344770 /* ADLTabSelectedInactive.png in Resources */ = {isa = PBXBuildFile; fileRef = 775BB94314C6706900344770 /* ADLTabSelectedInactive.png */; };
+		775BB94614C6706900344770 /* ADLTabUnselectedInactive.png in Resources */ = {isa = PBXBuildFile; fileRef = 775BB94414C6706900344770 /* ADLTabUnselectedInactive.png */; };
 		775D650B1497FF06000FC9EB /* ADLPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 775D65091497FF06000FC9EB /* ADLPreferences.xib */; };
 		77735EBE14687E350024D99A /* ADLList+CollectionAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 77735EBC14687E350024D99A /* ADLList+CollectionAdditions.m */; };
 		77735EC3146A33210024D99A /* NSSet+ADLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 77735EC1146A33200024D99A /* NSSet+ADLAdditions.m */; };
@@ -196,6 +198,8 @@
 		7754A8B61448EBAF00DBE182 /* ADLListCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADLListCollection.m; path = Shared/ADLListCollection.m; sourceTree = "<group>"; };
 		7754A8B91448ECBB00DBE182 /* CalCalendarStore+ADLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CalCalendarStore+ADLAdditions.h"; sourceTree = "<group>"; };
 		7754A8BA1448ECBB00DBE182 /* CalCalendarStore+ADLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CalCalendarStore+ADLAdditions.m"; sourceTree = "<group>"; };
+		775BB94314C6706900344770 /* ADLTabSelectedInactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ADLTabSelectedInactive.png; path = Resources/ADLTabSelectedInactive.png; sourceTree = "<group>"; };
+		775BB94414C6706900344770 /* ADLTabUnselectedInactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ADLTabUnselectedInactive.png; path = Resources/ADLTabUnselectedInactive.png; sourceTree = "<group>"; };
 		775D650A1497FF06000FC9EB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ADLPreferences.xib; sourceTree = "<group>"; };
 		77735EBB14687E340024D99A /* ADLList+CollectionAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ADLList+CollectionAdditions.h"; path = "Shared/ADLList+CollectionAdditions.h"; sourceTree = "<group>"; };
 		77735EBC14687E350024D99A /* ADLList+CollectionAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ADLList+CollectionAdditions.m"; path = "Shared/ADLList+CollectionAdditions.m"; sourceTree = "<group>"; };
@@ -395,6 +399,8 @@
 				77A4D09914A38F6900607557 /* ADLQuickToggle.xib */,
 				77B986CC1402C56D004A2293 /* ADLNSTabViewController.xib */,
 				7722BF3D1402A431003498D8 /* MainMenu.xib */,
+				775BB94314C6706900344770 /* ADLTabSelectedInactive.png */,
+				775BB94414C6706900344770 /* ADLTabUnselectedInactive.png */,
 				77530FE414229B3200C0645F /* ADLTabSelected.png */,
 				77530FE514229B3200C0645F /* ADLTabUnselected.png */,
 				772C683E1427D9A900CEF932 /* ADLLinen.png */,
@@ -673,6 +679,8 @@
 				775D650B1497FF06000FC9EB /* ADLPreferences.xib in Resources */,
 				77E6FBC014A257A4000FD06E /* Julep-UIElement.app in Resources */,
 				77BD89DA14A4008300FE89A0 /* julep.icns in Resources */,
+				775BB94514C6706900344770 /* ADLTabSelectedInactive.png in Resources */,
+				775BB94614C6706900344770 /* ADLTabUnselectedInactive.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};