Commits

Steve Streeting committed 0570e0a

Fixed bug #66 (http://bit.ly/9FCSaz) - When using the BWSelectableToolbar in a sheet, the 2nd view and others were not positioned correctly. The problem was that the stored window frame sizes are calculated in IB where there is a title bar. I use the difference between the stored value and the actual value for the first view to adjust for this at run time.

Comments (0)

Files changed (1)

BWSelectableToolbar.m

 	[self setDelegate:self];
 	[self setItemSelectors];
 	
+	if (!inIB && [[[self editableToolbar] _window] isSheet])
+	{
+		// When using the toolbar in a sheet, the stored window sizes will be 
+		// incorrect because they include the title bar
+		NSMutableDictionary *tempWSBI = [[[helper windowSizesByIdentifier] mutableCopy] autorelease];	
+
+		
+		NSSize storedSz = [[tempWSBI objectForKey:[helper selectedIdentifier]] sizeValue];
+		NSSize actualSz = [[[self editableToolbar] _window] frame].size;
+		CGFloat heightDiff = storedSz.height - actualSz.height;
+		
+		for (NSString* identifier in [tempWSBI allKeys])
+		{
+			
+			NSSize sz = [[tempWSBI objectForKey:identifier] sizeValue];
+			sz.height -= heightDiff;
+			[tempWSBI setObject:[NSValue valueWithSize:sz] forKey:identifier];
+			
+		}
+		[helper setWindowSizesByIdentifier:tempWSBI];
+		
+	}
+
+	
 	if ([helper selectedIdentifier] != nil && [helper contentViewsByIdentifier].count != 0)
 	{
 		// When the actual app is ran or an item is added or removed from the toolbar in IB, we need to select the previously stored identifier
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.