Vertical tabs implemented, and tab location preference now respected

frontends/gnustep/BrowserWindowController.h

@@ -4,9 +4,11 @@
 #import "netsurf/netsurf.h"
 #import "netsurf/mouse.h"
 #import "Website.h"
+#import "Preferences.h"
+#import "VerticalTabsView.h"
 
 struct browser_window;
-@interface BrowserWindowController : NSWindowController<NSTextFieldDelegate> {
+@interface BrowserWindowController : NSWindowController<NSTextFieldDelegate, VerticalTabsViewDelegate> {
 	id backButton;
 	id forwardButton;
 	id urlBar;
@@ -20,6 +22,8 @@ struct browser_window;
 	BOOL isClosing;
 	id activeTab;
 	id verticalTabsView;
+	TabLocation currentTabLocation;
+	
 	
 	// These three are set based on the currently focused tab.
 	id scrollView;

frontends/gnustep/BrowserWindowController.m

@@ -76,6 +76,7 @@ static id newTabTarget;
 		lastRequestedPointer = 999;
 		tabs = [[NSMutableArray alloc] init];
 		isClosing = NO;
+		currentTabLocation = TabLocationNone;
 	}
 	return self;
 }
@@ -160,6 +161,7 @@ static id newTabTarget;
 	}
 	[tabView removeTabViewItem: [tab tabItem]];
 	[tabs removeObjectAtIndex: idx];
+	[verticalTabsView reloadTabs];
 	if (activeTab == tab) {
 		activeTab = nil;
 	}
@@ -307,6 +309,7 @@ static id newTabTarget;
 	[[tab tabItem] setLabel: tabTitle];
 	// Label doesn't get updated automatically.
 	[tabView setNeedsDisplayInRect: [tabView bounds]];
+	[verticalTabsView reloadTabs];
 }
 
 -(void)findNext: (NSString*)needle matchCase: (BOOL)matchCase sender: (id)sender {
@@ -364,6 +367,11 @@ static id newTabTarget;
 	nsurl_unref(url);
 }
 
+// MARK: - VerticalTabViewDelegate
+-(void)verticalTabsView: (VerticalTabsView*)verticalTabsView didSelectTab: (id<VerticalTabsViewItem>)aTab {
+	[tabView selectTabViewItem: [aTab tabItem]];
+}
+
 // MARK: - TabViewDelegate
 -(void)tabView: (NSTabView*)aTabView didSelectTabViewItem: (NSTabViewItem*)aTabViewItem {
 	NSLog(@"Selected tab");
@@ -411,10 +419,13 @@ static id newTabTarget;
 	
 	TabContents *tc = [[TabContents alloc] initWithScroll: newScrollView plot:
 		newPlotView browser: aBrowser tabItem: tabItem];
-	[self setActive: tc];
 	[tabs addObject: tc];
+	[verticalTabsView reloadTabs];
+	[self setActive: tc];
 	if (![[Preferences defaultPreferences] switchTabImmediately]) {
 		[tabView selectTabViewItem: previouslySelected];
+	} else {
+		[tabView selectTabViewItem: tabItem];
 	}
 	
 	
@@ -438,6 +449,7 @@ static id newTabTarget;
 	Website *website = [self currentWebsiteForTab: activeTab];
 	[urlBar setStringValue: [website url]];
 	[[self window] setTitle: [website name]];
+	[verticalTabsView setSelectedTab: activeTab];
 }
 
 -(Website*)currentWebsiteForTab: (id)tab {
@@ -464,41 +476,58 @@ static id newTabTarget;
 		TOP_CONTENT_HEIGHT;
 	rect.size.width = [[[self window] contentView] frame].size.width;
 	if (hideTabs) {
+		[verticalTabsView removeFromSuperview];
+		verticalTabsView = nil;
 		[tabView setTabViewType: NSNoTabsNoBorder];
 		[tabView setFrame: rect];
 		[tabView selectTabViewItem: [activeTab tabItem]];
+		currentTabLocation = TabLocationNone;
 		return;
 	}
-	switch (location) {
-	case TabLocationTop:
-		[tabView setTabViewType: NSTopTabsBezelBorder];
-		break;
-	case TabLocationBottom:
-		[tabView setTabViewType: NSBottomTabsBezelBorder];
-		break;
-	case TabLocationLeft:
-		verticalTabsView = [[VerticalTabsView alloc] initWithTabs: tabs];
+
+	if (currentTabLocation == location) {
+		// No change.
+		return;
+	}
+	
+	if (location == TabLocationTop || location == TabLocationBottom) {
+		// Non vertical tabs!
+		[verticalTabsView removeFromSuperview];
+		verticalTabsView = nil;
+		[tabView setTabViewType: location == TabLocationTop ? 
+			NSTopTabsBezelBorder : NSBottomTabsBezelBorder];
+	} else {
+		// Vertical tabs!
 		NSRect vtabsFrame = rect;
+		NSUInteger resizingMask;
 		vtabsFrame.size.width = VERTICAL_TAB_WIDTH;
+		if (location == TabLocationLeft) {
+			resizingMask = NSViewHeightSizable | NSViewMaxXMargin;
+			rect.size.width -= VERTICAL_TAB_WIDTH;
+			rect.origin.x = VERTICAL_TAB_WIDTH;
+		} else {
+			resizingMask = NSViewHeightSizable | NSViewMinXMargin;
+			vtabsFrame.origin.x = rect.size.width - VERTICAL_TAB_WIDTH;
+	  		rect.size.width -= VERTICAL_TAB_WIDTH;
+	  		rect.origin.x = 0;
+		}
+		if (verticalTabsView == nil) {
+			verticalTabsView = [[VerticalTabsView alloc] initWithTabs: tabs];
+			[verticalTabsView setDelegate: self];
+			[verticalTabsView autorelease];
+		}
+		[verticalTabsView setAutoresizingMask: resizingMask];
 		[verticalTabsView setFrame: vtabsFrame];
 		[[[self window] contentView] addSubview: verticalTabsView];
 		NSLog(@"tabs: %@", verticalTabsView);
 		[verticalTabsView reloadTabs];
 		[tabView setTabViewType: NSNoTabsNoBorder];
-		rect.size.width -= VERTICAL_TAB_WIDTH;
-		rect.origin.x = VERTICAL_TAB_WIDTH;
-		break;
-	case TabLocationRight:
-		[tabView setTabViewType: NSNoTabsNoBorder];
-		rect.size.width -= VERTICAL_TAB_WIDTH;
-		break;
-	default:
-		NSLog(@"Invalid tab location");
-		break;
 	}
+
 	[tabView setFrame: rect];
 	// Work around a graphical glitch where the tab view doesn't properly readjust itself
 	[tabView selectTabViewItem: [activeTab tabItem]];
+	currentTabLocation = location;
 }
 
 -(void)onPreferencesUpdated: (id)sender {

frontends/gnustep/Preferences.h

@@ -11,7 +11,8 @@ typedef NS_ENUM(NSInteger, TabLocation) {
 	TabLocationTop = 0,
 	TabLocationRight,
 	TabLocationBottom,
-	TabLocationLeft
+	TabLocationLeft,
+	TabLocationNone
 };
 
 // Certain preferences will notify that they have been updated using this key.

frontends/gnustep/VerticalTabsView.h

@@ -19,4 +19,5 @@
 -(id)initWithTabs: (NSArray *)someTabItems;
 -(void)reloadTabs;
 -(void)setSelectedTab: (id<VerticalTabsViewItem>)aTab;
+-(void)setDelegate: (id<VerticalTabsViewDelegate>)aDelegate;
 @end

frontends/gnustep/VerticalTabsView.m

@@ -32,7 +32,15 @@
 }
 
 -(void)setSelectedTab: (id<VerticalTabsViewItem>)aTab {
-	
+	NSUInteger idx = [tabItems indexOfObject: aTab];
+	if (idx != NSNotFound) {
+		[tableView selectRowIndexes: [NSIndexSet indexSetWithIndex: idx]
+			byExtendingSelection: NO];
+	}
+}
+
+-(void)setDelegate: (id<VerticalTabsViewDelegate>)aDelegate {
+	delegate = aDelegate;
 }
 
 -(NSInteger)numberOfRowsInTableView: (NSTableView*)aTableView {
@@ -49,6 +57,10 @@
 
 -(void)tableViewSelectionDidChange: (NSTableView*)aTableView {
 	NSLog(@"Selection changed");
+	NSInteger idx = [tableView selectedRow];
+	if (idx > -1) {
+		[delegate verticalTabsView: self didSelectTab: [tabItems objectAtIndex: idx]];
+	}
 }
 
 @end