Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new tab widget implementation (bug 235782)

Browse Source
This commit is contained in:
pinkerton%aol.net 2004-09-02 22:52:29 +00:00
parent 3e285230a8
commit a048a445b3
27 changed files with 1711 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

330
camino/Camino.xcode/project.pbxproj
View File

@ -1089,6 +1089,10 @@
3F44AC2605BDFB9E00CB4B08,
3F44AC2705BDFB9E00CB4B08,
3F27D94C05DB2600007B543D,
3FF08EF906E7CF3F001C9B19,
3FF08F0906E7CF9C001C9B19,
3FF08F0A06E7CF9C001C9B19,
3FF08F0B06E7CF9C001C9B19,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -1679,6 +1683,12 @@
E091C0EE06225EA3007D9E8F,
3FC949610642ED39008E2E3D,
3FC949620642ED39008E2E3D,
3FF08F1506E7D3C2001C9B19,
3FF08F1606E7D3C2001C9B19,
3FF08F1706E7D3C2001C9B19,
3FF08F1806E7D3C2001C9B19,
3FF08F1906E7D3C2001C9B19,
3FF08F1A06E7D3C2001C9B19,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -2207,6 +2217,10 @@
3F44ACCD05BDFB9E00CB4B08,
3F44ACCE05BDFB9E00CB4B08,
3F27D94D05DB2600007B543D,
3FF08EFA06E7CF3F001C9B19,
3FF08F0006E7CF86001C9B19,
3FF08F0106E7CF86001C9B19,
3FF08F0206E7CF86001C9B19,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -5018,6 +5032,10 @@
3F44AE5F05BDFBA000CB4B08,
3F44AE6005BDFBA000CB4B08,
3F27D94E05DB2600007B543D,
3FF08EFB06E7CF3F001C9B19,
3FF08F0C06E7CF9C001C9B19,
3FF08F0D06E7CF9C001C9B19,
3FF08F0E06E7CF9C001C9B19,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -5608,6 +5626,12 @@
E091C0FD06225EA3007D9E8F,
3FC949630642ED39008E2E3D,
3FC949640642ED39008E2E3D,
3FF08F1B06E7D3C2001C9B19,
3FF08F1C06E7D3C2001C9B19,
3FF08F1D06E7D3C2001C9B19,
3FF08F1E06E7D3C2001C9B19,
3FF08F1F06E7D3C2001C9B19,
3FF08F2006E7D3C2001C9B19,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -6137,6 +6161,10 @@
3F44AF0705BDFBA000CB4B08,
3F44AF0805BDFBA000CB4B08,
3F27D94F05DB2600007B543D,
3FF08EFC06E7CF3F001C9B19,
3FF08F0306E7CF86001C9B19,
3FF08F0406E7CF86001C9B19,
3FF08F0506E7CF86001C9B19,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@ -8921,6 +8949,294 @@
settings = {
};
};
3FF08EF706E7CF3F001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = BrowserTabBarView.h;
path = src/browser/BrowserTabBarView.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08EF806E7CF3F001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
name = BrowserTabBarView.mm;
path = src/browser/BrowserTabBarView.mm;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08EF906E7CF3F001C9B19 = {
fileRef = 3FF08EF706E7CF3F001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08EFA06E7CF3F001C9B19 = {
fileRef = 3FF08EF806E7CF3F001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08EFB06E7CF3F001C9B19 = {
fileRef = 3FF08EF706E7CF3F001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08EFC06E7CF3F001C9B19 = {
fileRef = 3FF08EF806E7CF3F001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08EFD06E7CF86001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
name = RolloverTrackingCell.mm;
path = src/extensions/RolloverTrackingCell.mm;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08EFE06E7CF86001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
name = TabButtonCell.mm;
path = src/extensions/TabButtonCell.mm;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08EFF06E7CF86001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
name = TruncatingTextAndImageCell.mm;
path = src/extensions/TruncatingTextAndImageCell.mm;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F0006E7CF86001C9B19 = {
fileRef = 3FF08EFD06E7CF86001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0106E7CF86001C9B19 = {
fileRef = 3FF08EFE06E7CF86001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0206E7CF86001C9B19 = {
fileRef = 3FF08EFF06E7CF86001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0306E7CF86001C9B19 = {
fileRef = 3FF08EFD06E7CF86001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0406E7CF86001C9B19 = {
fileRef = 3FF08EFE06E7CF86001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0506E7CF86001C9B19 = {
fileRef = 3FF08EFF06E7CF86001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0606E7CF9C001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = RolloverTrackingCell.h;
path = src/extensions/RolloverTrackingCell.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F0706E7CF9C001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = TabButtonCell.h;
path = src/extensions/TabButtonCell.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F0806E7CF9C001C9B19 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = TruncatingTextAndImageCell.h;
path = src/extensions/TruncatingTextAndImageCell.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F0906E7CF9C001C9B19 = {
fileRef = 3FF08F0606E7CF9C001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0A06E7CF9C001C9B19 = {
fileRef = 3FF08F0706E7CF9C001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0B06E7CF9C001C9B19 = {
fileRef = 3FF08F0806E7CF9C001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0C06E7CF9C001C9B19 = {
fileRef = 3FF08F0606E7CF9C001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0D06E7CF9C001C9B19 = {
fileRef = 3FF08F0706E7CF9C001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0E06E7CF9C001C9B19 = {
fileRef = 3FF08F0806E7CF9C001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F0F06E7D3C2001C9B19 = {
isa = PBXFileReference;
lastKnownFileType = image.tiff;
name = tab_active_bg.tif;
path = resources/images/chrome/tab_active_bg.tif;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F1006E7D3C2001C9B19 = {
isa = PBXFileReference;
lastKnownFileType = image.tiff;
name = tab_bar_bg.tif;
path = resources/images/chrome/tab_bar_bg.tif;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F1106E7D3C2001C9B19 = {
isa = PBXFileReference;
lastKnownFileType = image.tiff;
name = tab_button_divider.tif;
path = resources/images/chrome/tab_button_divider.tif;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F1206E7D3C2001C9B19 = {
isa = PBXFileReference;
lastKnownFileType = image.tiff;
name = tab_hover.tif;
path = resources/images/chrome/tab_hover.tif;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F1306E7D3C2001C9B19 = {
isa = PBXFileReference;
lastKnownFileType = image.tiff;
name = tab_left_side.tif;
path = resources/images/chrome/tab_left_side.tif;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F1406E7D3C2001C9B19 = {
isa = PBXFileReference;
lastKnownFileType = image.tiff;
name = tab_right_side.tif;
path = resources/images/chrome/tab_right_side.tif;
refType = 2;
sourceTree = SOURCE_ROOT;
};
3FF08F1506E7D3C2001C9B19 = {
fileRef = 3FF08F0F06E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1606E7D3C2001C9B19 = {
fileRef = 3FF08F1006E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1706E7D3C2001C9B19 = {
fileRef = 3FF08F1106E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1806E7D3C2001C9B19 = {
fileRef = 3FF08F1206E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1906E7D3C2001C9B19 = {
fileRef = 3FF08F1306E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1A06E7D3C2001C9B19 = {
fileRef = 3FF08F1406E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1B06E7D3C2001C9B19 = {
fileRef = 3FF08F0F06E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1C06E7D3C2001C9B19 = {
fileRef = 3FF08F1006E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1D06E7D3C2001C9B19 = {
fileRef = 3FF08F1106E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1E06E7D3C2001C9B19 = {
fileRef = 3FF08F1206E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F1F06E7D3C2001C9B19 = {
fileRef = 3FF08F1306E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
3FF08F2006E7D3C2001C9B19 = {
fileRef = 3FF08F1406E7D3C2001C9B19;
isa = PBXBuildFile;
settings = {
};
};
//3F0
//3F1
//3F2
@ -9621,6 +9937,12 @@
children = (
3FC9495F0642ED39008E2E3D,
3FC949600642ED39008E2E3D,
3FF08F0F06E7D3C2001C9B19,
3FF08F1006E7D3C2001C9B19,
3FF08F1106E7D3C2001C9B19,
3FF08F1206E7D3C2001C9B19,
3FF08F1306E7D3C2001C9B19,
3FF08F1406E7D3C2001C9B19,
E091C0D006225EA3007D9E8F,
F540BD1A029ED15301026D5D,
F540BD1C029ED17901026D5D,
@ -9846,6 +10168,8 @@
2E2939FF027F33604B000102,
2E748B73029A448D4B000102,
F549ACDE0302DE6001026D5D,
3FF08EF706E7CF3F001C9B19,
3FF08EF806E7CF3F001C9B19,
F5BF71460231B8BC010001CA,
F5B950BD030C83B601A96654,
3003B8890445124400B85BF3,
@ -12152,6 +12476,9 @@
F583E3C203B8228F01A80166,
F541495A02711A8301A80166,
F541495E02711B0001A80166,
3FF08F0606E7CF9C001C9B19,
3FF08F0706E7CF9C001C9B19,
3FF08F0806E7CF9C001C9B19,
);
isa = PBXGroup;
name = Headers;
@ -12175,6 +12502,9 @@
F541495F02711B0001A80166,
F5FDF167031AF47301DE816D,
3F2CF8CC042A88B7005FD42F,
3FF08EFD06E7CF86001C9B19,
3FF08EFE06E7CF86001C9B19,
3FF08EFF06E7CF86001C9B19,
);
isa = PBXGroup;
name = Source;

BIN
camino/resources/images/chrome/tab_active_bg.tif Normal file
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_bar_bg.tif Normal file
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_button_divider.tif Normal file
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_close.tif
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_close_pressed.tif
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_hover.tif Normal file
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_left_side.tif Normal file
View File

Binary file not shown.

BIN
camino/resources/images/chrome/tab_right_side.tif Normal file
View File

Binary file not shown.

28
camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib generated
View File

@ -55,7 +55,12 @@
};
SUPERCLASS = NSObject;
},
{CLASS = BrowserContainerView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
CLASS = BrowserContainerView;
LANGUAGE = ObjC;
OUTLETS = {mTabBarView = BrowserTabBarView; mTabView = BrowserTabView; };
SUPERCLASS = NSView;
},
{
ACTIONS = {toggleBookmarkManager = id; };
CLASS = BrowserContentView;
@ -68,7 +73,19 @@
};
SUPERCLASS = NSView;
},
{CLASS = BrowserTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; },
{
CLASS = BrowserTabBarView;
LANGUAGE = ObjC;
OUTLETS = {mTabView = BrowserTabView; };
SUPERCLASS = NSView;
},
{
CLASS = BrowserTabView;
LANGUAGE = ObjC;
OUTLETS = {mTabBar = BrowserTabBarView; };
SUPERCLASS = NSTabView;
},
{CLASS = BrowserTabViewItem; LANGUAGE = ObjC; SUPERCLASS = IconTabViewItem; },
{
CLASS = BrowserWindow;
LANGUAGE = ObjC;
@ -184,6 +201,7 @@
OUTLETS = {mBrowserWindowController = BrowserWindowController; };
SUPERCLASS = RDFOutlineViewDataSource;
},
{CLASS = IconTabViewItem; LANGUAGE = ObjC; SUPERCLASS = NSTabViewItem; },
{CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
ACTIONS = {
@ -249,6 +267,7 @@
};
SUPERCLASS = NSObject;
},
{CLASS = NSImage; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = NSObject; LANGUAGE = ObjC; },
{CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; },
{
@ -258,8 +277,11 @@
SUPERCLASS = NSObject;
},
{CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = RolloverTrackingCell; LANGUAGE = ObjC; SUPERCLASS = NSCell; },
{CLASS = SearchTextField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; },
{CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
{CLASS = TabButtonCell; LANGUAGE = ObjC; SUPERCLASS = RolloverTrackingCell; },
{CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = TruncatingTextAndImageCell; LANGUAGE = ObjC; SUPERCLASS = NSCell; }
);
IBVersion = 1;
}

5
camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib generated
View File

@ -25,7 +25,7 @@
<key>826</key>
<string>84 401 213 60 0 0 1152 746 </string>
<key>894</key>
<string>311 722 156 68 0 0 1280 832 </string>
<string>242 643 130 49 0 0 1024 746 </string>
<key>919</key>
<string>337 341 606 458 0 0 1280 832 </string>
</dict>
@ -40,8 +40,9 @@
<key>IBOpenObjects</key>
<array>
<integer>894</integer>
<integer>10</integer>
</array>
<key>IBSystem Version</key>
<string>7F44</string>
<string>7M34</string>
</dict>
</plist>

BIN
camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib generated
View File

Binary file not shown.

6
camino/src/browser/BrowserContentViews.h
View File

@ -40,6 +40,7 @@
@class BookmarkToolbar;
@class BrowserTabView;
@class BrowserTabBarView;
@interface BrowserContentView : NSView
{
@ -56,12 +57,13 @@
@end
@interface BrowserContainerView : NSView
{
IBOutlet BrowserTabView *mTabView;
IBOutlet BrowserTabBarView *mTabBarView;
}
@end
@end
@interface BookmarkManagerView : NSView
{

27
camino/src/browser/BrowserContentViews.mm
View File

@ -40,6 +40,7 @@
#import "BookmarkToolbar.h"
#import "BrowserTabView.h"
#import "BrowserTabBarView.h"
/*
@ -88,7 +89,6 @@
*/
@implementation BrowserContentView
- (void) dealloc
@ -205,23 +205,20 @@
#pragma mark -
@implementation BrowserContainerView : NSView
@implementation BrowserContainerView
- (void)resizeSubviewsWithOldSize:(NSSize)oldFrameSize
{
BrowserTabView* browserTabView = (BrowserTabView *)[[self subviews] objectAtIndex:0];
float tabsTopSpace = [browserTabView getExtraTopSpace];
// nuke the shadow. It's a shame we need this hard-coded values.
const float kHorizontalEdgeShadowWidth = 10.0;
const float kBottomEdgeShadowWidth = 12.0;
NSRect adjustedRect = [self frame];
adjustedRect = NSInsetRect(adjustedRect, -kHorizontalEdgeShadowWidth, 0);
adjustedRect.origin.y = -kBottomEdgeShadowWidth;
adjustedRect.size.height -= (tabsTopSpace - kBottomEdgeShadowWidth);
[browserTabView setFrame:adjustedRect];
NSRect adjustedRect = [self bounds];
// mTabView will have set the appropriate size by now
adjustedRect.size.height -= [mTabBarView frame].size.height;
[mTabView setFrame:adjustedRect];
NSRect tbRect = adjustedRect;
tbRect.size.height = [mTabBarView frame].size.height;
tbRect.origin.x = 0;
tbRect.origin.y = NSMaxY(adjustedRect);
[mTabBarView setFrame:tbRect];
}
@end

68
camino/src/browser/BrowserTabBarView.h Normal file
View File

@ -0,0 +1,68 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is tab UI for Camino.
*
* The Initial Developer of the Original Code is
* Geoff Beier.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import <Cocoa/Cocoa.h>
#import "BrowserTabView.h"
#import "TabButtonCell.h"
@interface BrowserTabBarView : NSView
{
@private
// this tab view should be tabless and borderless
IBOutlet BrowserTabView *mTabView;
TabButtonCell *mActiveTabButton; // active tab button, mainly useful for handling drags (STRONG)
// drag tracking
NSPoint mLastClickPoint;
BOOL mDragStarted;
NSView *mDragDest;
TabButtonCell *mDragDestButton;
}
// destroy the tab bar and recreate it from the tabview
-(void)rebuildTabBar;
// return the height the tab bar should be
-(float)tabBarHeight;
-(BrowserTabViewItem*)tabViewItemAtPoint:(NSPoint)location;
@end
@interface NSImage ( BrowserTabBarViewAdditions )
- (void)paintTiledInRect:(NSRect)rect;
@end

431
camino/src/browser/BrowserTabBarView.mm Normal file
View File

@ -0,0 +1,431 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is tab UI for Camino.
*
* The Initial Developer of the Original Code is
* Geoff Beier.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import "BrowserTabBarView.h"
#import "BrowserTabViewItem.h"
#import "TabButtonCell.h"
@interface BrowserTabBarView (PRIVATE)
-(void)layoutButtons;
-(void)loadImages;
-(void)drawTabBarBackgroundInRect:(NSRect)rect withActiveTabRect:(NSRect)tabRect;
-(TabButtonCell*)buttonAtPoint:(NSPoint)clickPoint;
-(void)registerTabButtonsForTracking;
-(void)unregisterTabButtonsForTracking;
@end
static NSImage *gBackgroundImage = nil;
static NSImage *gTabButtonDividerImage = nil;
static const float kTabBarDefaultHeight = 22.0;
@implementation BrowserTabBarView
static const int kTabBarMargin = 5; // left/right margin for tab bar
static const float kMinTabWidth = 42.0; // tabs smaller than this are useless... tabs this small may be useless
static const float kMaxTabWidth = 175.0; // the widest tabs that will be drawn
static const int kTabDragThreshold = 3; // distance a drag must go before we start dnd
-(id)initWithFrame:(NSRect)frame
{
self = [super initWithFrame:frame];
if (self) {
mActiveTabButton = nil;
// this will not likely have any result here
[self rebuildTabBar];
[self registerForDraggedTypes:[NSArray arrayWithObjects: @"MozURLType", @"MozBookmarkType", NSStringPboardType,
NSFilenamesPboardType, NSURLPboardType, nil]];
}
return self;
}
-(void)awakeFromNib
{
// this needs to be called again since our tabview should be non-nil now
[self rebuildTabBar];
}
-(void)dealloc
{
[mActiveTabButton release];
[super dealloc];
}
-(void)drawRect:(NSRect)rect
{
// this should only occur the first time any instance of this view is drawn
if (!gBackgroundImage || !gTabButtonDividerImage)
[self loadImages];
// determine the frame of the active tab button and fill the rest of the bar in with the background
NSRect activeTabButtonFrame = [mActiveTabButton frame];
[self drawTabBarBackgroundInRect:rect withActiveTabRect:activeTabButtonFrame];
NSArray *tabItems = [mTabView tabViewItems];
NSEnumerator *tabEnumerator = [tabItems objectEnumerator];
BrowserTabViewItem *tab = [tabEnumerator nextObject];
TabButtonCell *prevButton = nil;
while (tab != nil) {
TabButtonCell *tabButton = [tab tabButtonCell];
BrowserTabViewItem *nextTab = [tabEnumerator nextObject];
NSRect tabButtonFrame = [tabButton frame];
if (NSIntersectsRect(tabButtonFrame,rect))
[tabButton drawWithFrame:tabButtonFrame inView:self];
// draw the first divider.
if ((prevButton == nil) && ([tab tabState] != NSSelectedTab))
[gTabButtonDividerImage compositeToPoint:NSMakePoint(tabButtonFrame.origin.x - [gTabButtonDividerImage size].width, tabButtonFrame.origin.y)
operation:NSCompositeSourceOver];
prevButton = tabButton;
tab = nextTab;
}
}
-(void)setFrame:(NSRect)frameRect
{
[super setFrame:frameRect];
// tab buttons probably need to be resized if the frame changes
[self layoutButtons];
}
-(NSMenu*)menuForEvent:(NSEvent*)theEvent
{
NSPoint clickPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
TabButtonCell *clickedTabButton = [self buttonAtPoint:clickPoint];
// XXX should there be a menu if someone clicks in the tab bar where there is no tab?
return (clickedTabButton) ? [clickedTabButton menu] : nil;
}
-(void)mouseDown:(NSEvent*)theEvent
{
NSPoint clickPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
TabButtonCell *clickedTabButton = [self buttonAtPoint:clickPoint];
mLastClickPoint = clickPoint;
if (clickedTabButton && ![clickedTabButton willTrackMouse:theEvent inRect:[clickedTabButton frame] ofView:self])
[[[clickedTabButton tabViewItem] tabItemContentsView] mouseDown:theEvent];
}
-(void)mouseUp:(NSEvent*)theEvent
{
NSPoint clickPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
TabButtonCell * clickedTabButton = [self buttonAtPoint:clickPoint];
if (clickedTabButton && ![clickedTabButton willTrackMouse:theEvent inRect:[clickedTabButton frame] ofView:self])
[[[clickedTabButton tabViewItem] tabItemContentsView] mouseUp:theEvent];
}
-(void)mouseDragged:(NSEvent*)theEvent
{
NSPoint clickPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
TabButtonCell *clickedTabButton = [self buttonAtPoint:clickPoint];
if (clickedTabButton &&
![clickedTabButton willTrackMouse:theEvent inRect:[clickedTabButton frame] ofView:self])
[[[clickedTabButton tabViewItem] tabItemContentsView] mouseDragged:theEvent];
/* else if (!mDragStarted) {
// XXX TODO: Handle dnd of tabs here
if ((abs((int)(mLastClickPoint.x - clickPoint.x)) >= kTabDragThreshold) ||
(abs((int)(mLastClickPoint.y - clickPoint.y)) >= kTabDragThreshold)) {
NSLog(@"Here's where we'd handle the drag among friends rather than the drag manager");
}*/
}
// returns the tab at the specified point
-(TabButtonCell*)buttonAtPoint:(NSPoint)clickPoint
{
NSEnumerator *buttonEnumerator = nil;
BrowserTabViewItem *tab = nil;
NSArray *tabItems = [mTabView tabViewItems];
NSEnumerator *tabEnumerator = [tabItems objectEnumerator];
while (tab = [tabEnumerator nextObject]) {
TabButtonCell *button = [tab tabButtonCell];
if (NSPointInRect(clickPoint,[button frame]))
return button;
}
return nil;
}
-(void) drawTabBarBackgroundInRect:(NSRect)rect withActiveTabRect:(NSRect)tabRect
{
// draw tab bar background, omitting the selected Tab
NSRect barFrame = [self bounds];
NSRect fillRect;
// first, fill to the left of the active tab
fillRect = NSMakeRect(barFrame.origin.x, barFrame.origin.y,
(tabRect.origin.x - barFrame.origin.x), barFrame.size.height);
if (NSIntersectsRect(fillRect,rect)) {
// make sure we're not drawing to the left or right of the actual rectangle we were asked to draw
if (fillRect.origin.x < NSMinX(rect)) {
fillRect.size.width -= NSMinX(rect) - fillRect.origin.x;
fillRect.origin.x = NSMinX(rect);
}
if (NSMaxX(fillRect) > NSMaxX(rect))
fillRect.size.width -= NSMaxX(fillRect) - NSMaxX(rect);
[gBackgroundImage paintTiledInRect:fillRect];
}
// then fill to the right
fillRect = NSMakeRect(NSMaxX(tabRect), barFrame.origin.y,
(NSMaxX(barFrame) - NSMaxX(tabRect)), barFrame.size.height);
if (NSIntersectsRect(fillRect,rect)) {
// make sure we're not drawing to the left or right of the actual rectangle we were asked to draw
if (fillRect.origin.x < NSMinX(rect)) {
fillRect.size.width -= NSMinX(rect) - fillRect.origin.x;
fillRect.origin.x = NSMinX(rect);
}
if (NSMaxX(fillRect) > NSMaxX(rect))
fillRect.size.width -= NSMaxX(fillRect) - NSMaxX(rect);
[gBackgroundImage paintTiledInRect:fillRect];
}
}
-(void)loadImages
{
if (!gBackgroundImage)
gBackgroundImage = [[NSImage imageNamed:@"tab_bar_bg"] retain];
if (!gTabButtonDividerImage)
gTabButtonDividerImage = [[NSImage imageNamed:@"tab_button_divider"] retain];
}
// construct the tab bar based on the current state of mTabView;
// should be called when tabs are first shown.
-(void)rebuildTabBar
{
[self unregisterTabButtonsForTracking];
[mActiveTabButton release];
mActiveTabButton = [[(BrowserTabViewItem *)[mTabView selectedTabViewItem] tabButtonCell] retain];
[self layoutButtons];
[self registerTabButtonsForTracking];
}
// allows tab button cells to react to mouse events
-(void)registerTabButtonsForTracking
{
if ([self window]) {
NSArray * tabItems = [mTabView tabViewItems];
NSEnumerator *tabEnumerator = [tabItems objectEnumerator];
NSPoint local = [[self window] convertScreenToBase:[NSEvent mouseLocation]];
local = [self convertPoint:local fromView:nil];
BrowserTabViewItem *tab = nil;
while (tab = [tabEnumerator nextObject]) {
TabButtonCell * tabButton = [tab tabButtonCell];
NSRect trackingRect = [tabButton frame];
[tabButton addTrackingRectInView: self withFrame:trackingRect cursorLocation:local];
}
}
}
// causes tab buttons to stop reacting to mouse events
-(void)unregisterTabButtonsForTracking
{
NSArray * tabItems = [mTabView tabViewItems];
NSEnumerator *tabEnumerator = [tabItems objectEnumerator];
BrowserTabViewItem *tab = nil;
while (tab = [tabEnumerator nextObject])
[[tab tabButtonCell] removeTrackingRectFromView: self];
}
// returns the height the tab bar should be if drawn
-(float)tabBarHeight
{
// this will be constant for now
return kTabBarDefaultHeight;
}
-(BrowserTabViewItem *)tabViewItemAtPoint:(NSPoint)location
{
TabButtonCell *button = [self buttonAtPoint:[self convertPoint:location fromView:nil]];
return (button) ? [button tabViewItem] : nil;
}
// sets the tab buttons to the largest kMinTabWidth <= size <= kMaxTabWidth where they all fit
// and calculates the frame for each.
-(void)layoutButtons
{
const int numTabs = [mTabView numberOfTabViewItems];
float tabWidth = kMaxTabWidth;
// calculate the largest tabs that would fit
float maxWidth = floor((NSWidth([self bounds]) - (2*kTabBarMargin))/numTabs);
// if our tabs are currently larger than that, shrink them to the larger of kMinTabWidth or maxWidth
if (tabWidth > maxWidth)
tabWidth = (maxWidth > kMinTabWidth ? maxWidth : kMinTabWidth);
// resize and position the tab buttons
int xCoord = kTabBarMargin;
NSArray *tabItems = [mTabView tabViewItems];
NSEnumerator *tabEnumerator = [tabItems objectEnumerator];
BrowserTabViewItem *tab = nil;
TabButtonCell *prevTabButton = nil;
while ((tab = [tabEnumerator nextObject])) {
TabButtonCell *tabButtonCell = [tab tabButtonCell];
NSSize buttonSize = [tabButtonCell size];
buttonSize.width = tabWidth;
buttonSize.height = kTabBarDefaultHeight;
NSPoint buttonOrigin = NSMakePoint(xCoord,0);
// TODO: take care of tabs that run off the end... right now we're the same as Firebird, except I think we
// hit our tab limit before we'll run off the end of the average user's windows given the current kMinTabWidth
[tabButtonCell setFrame:NSMakeRect(buttonOrigin.x,buttonOrigin.y,buttonSize.width,buttonSize.height)];
// If the tab ran off the edge, suppress its close button
if (buttonOrigin.x + buttonSize.width > NSMaxX([self bounds]))
[tabButtonCell hideCloseButton];
// tell the button whether it needs to draw the right side dividing line
if (NSSelectedTab == [tab tabState]) {
[tabButtonCell setDrawDivider:NO];
[prevTabButton setDrawDivider:NO];
} else {
[tabButtonCell setDrawDivider:YES];
}
prevTabButton = tabButtonCell;
xCoord += (int)tabWidth;
}
[self setNeedsDisplay:YES];
}
#pragma mark -
// NSDraggingDestination destination methods
-(unsigned int)draggingEntered:(id <NSDraggingInfo>)sender
{
TabButtonCell * button = [self buttonAtPoint:[self convertPoint:[sender draggingLocation] fromView:nil]];
if (!button)
return NSDragOperationGeneric;
mDragDest = [[button tabViewItem] tabItemContentsView];
mDragDestButton = button;
unsigned int rv = [ mDragDest draggingEntered:sender];
if (NSDragOperationNone != rv) {
[button setDragTarget:YES];
[self setNeedsDisplay:YES];
}
[self unregisterTabButtonsForTracking];
return rv;
}
-(unsigned int)draggingUpdated:(id <NSDraggingInfo>)sender
{
TabButtonCell * button = [self buttonAtPoint:[self convertPoint:[sender draggingLocation] fromView:nil]];
if (!button) {
if (mDragDestButton) {
[mDragDestButton setDragTarget:NO];
[self setNeedsDisplay:YES];
mDragDestButton = nil;
}
return NSDragOperationGeneric;
}
mDragDest = [[button tabViewItem] tabItemContentsView];
if (mDragDestButton != button) {
[mDragDestButton setDragTarget:NO];
[self setNeedsDisplay:YES];
mDragDestButton = button;
}
unsigned int rv = [mDragDest draggingUpdated:sender];
if (NSDragOperationNone != rv) {
[button setDragTarget:YES];
[self setNeedsDisplay:YES];
}
return rv;
}
-(void)draggingExited:(id <NSDraggingInfo>)sender
{
if (mDragDestButton)
[mDragDestButton setDragTarget:NO];
[self setNeedsDisplay:YES];
[self registerTabButtonsForTracking];
}
-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
{
BOOL rv = [mDragDest prepareForDragOperation: sender];
if (!rv) {
if (mDragDestButton)
[mDragDestButton setDragTarget:NO];
[self setNeedsDisplay:YES];
}
return rv;
}
-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
TabButtonCell * button = [self buttonAtPoint:[self convertPoint:[sender draggingLocation] fromView:nil]];
if (!button) {
if (mDragDestButton)
[mDragDestButton setDragTarget:NO];
return [mTabView performDragOperation:sender];
}
[mDragDestButton setDragTarget:NO];
[button setDragTarget:NO];
[self setNeedsDisplay:YES];
mDragDestButton = button;
mDragDest = [[button tabViewItem] tabItemContentsView];
[self registerTabButtonsForTracking];
return [mDragDest performDragOperation:sender];
}
@end
#pragma mark -
@implementation NSImage (BrowserTabBarViewAdditions)
//an addition to NSImage used by both BrowserTabBarView and TabButtonCell
//tiles an image in the specified rect... even though it should work vertically, these images
//will only look right tiled horizontally.
-(void)paintTiledInRect:(NSRect)rect
{
NSSize imageSize = [self size];
NSRect currTile = NSMakeRect(rect.origin.x, rect.origin.y, imageSize.width, imageSize.height);
while (currTile.origin.y < NSMaxY(rect)) {
while (currTile.origin.x < NSMaxX(rect)) {
// clip the tile as needed
if (NSMaxX(currTile) > NSMaxX(rect)) {
currTile.size.width -= NSMaxX(currTile) - NSMaxX(rect);
}
if (NSMaxY(currTile) > NSMaxY(rect)) {
currTile.size.height -= NSMaxY(currTile) - NSMaxY(rect);
}
NSRect imageRect = NSMakeRect(0, 0, currTile.size.width, currTile.size.height);
[self compositeToPoint:currTile.origin fromRect:imageRect operation:NSCompositeSourceOver];
currTile.origin.x += currTile.size.width;
}
currTile.origin.y += currTile.size.height;
}
}
@end

4
camino/src/browser/BrowserTabView.h
View File

@ -19,6 +19,7 @@
#import <Cocoa/Cocoa.h>
#import "BrowserTabViewItem.h"
@class BrowserTabBarView;
@interface BrowserTabView : NSTabView
{
@ -26,6 +27,7 @@
BOOL mIsDropTarget;
BOOL mLastClickIsPotentialDrag;
int maxNumberOfTabs; // 0 means 'no max'
IBOutlet BrowserTabBarView * mTabBar;
}
+ (BrowserTabViewItem*)makeNewTabItem;
@ -42,9 +44,9 @@
- (void)addTabForURL:(NSString*)aURL referrer:(NSString*)aReferrer;
- (float)getExtraTopSpace;
- (BOOL)tabsVisible;
- (BrowserTabViewItem*)itemWithTag:(int)tag;
- (void)refreshTabBar:(BOOL)rebuild;
@end

76
camino/src/browser/BrowserTabView.mm
View File

@ -47,6 +47,8 @@
#import "BookmarkFolder.h"
#import "Bookmark.h"
#import "BookmarkToolbar.h"
#import "BrowserTabBarView.h"
//////////////////////////
// NEEDS IMPLEMENTED : Implement drag tracking for moving tabs around.
@ -130,7 +132,10 @@
// of the tab being removed. Users, however, want the tab to the right to
// be selected. This also matches how mozilla works. Select the right tab
// first so we don't take the hit of displaying the left tab before we switch.
if ( [self selectedTabViewItem] == tabViewItem )
// make sure the close button and spinner get removed
[(BrowserTabViewItem *)tabViewItem willBeRemoved:YES];
if ([self selectedTabViewItem] == tabViewItem)
[self selectNextTabViewItem:self];
[super removeTabViewItem:tabViewItem];
[self showOrHideTabsAsAppropriate];
@ -192,8 +197,21 @@
/*** Instance Methods ***/
/******************************************/
// 03-03-2002 mlj: Modifies tab view size and type appropriately... Fragile.
// Only to be used with the 2 types of tab view which we use in Chimera.
// redraws the tab bar, rebuilding it if instructed
- (void)refreshTabBar:(BOOL)rebuild
{
// don't bother if it's not even visible
if ([self tabsVisible]) {
if (rebuild) {
[mTabBar rebuildTabBar];
} else {
[mTabBar setNeedsDisplay:YES];
}
}
}
// Only to be used with the 2 types of tab view which we use in Camino.
- (void)showOrHideTabsAsAppropriate
{
//if ( autoHides == YES )
@ -201,62 +219,35 @@
BOOL tabVisibilityChanged = NO;
BOOL tabsVisible = NO;
if ( [[self tabViewItems] count] < 2)
{
if ( [self tabViewType] != NSNoTabsBezelBorder )
{
[self setTabViewType:NSNoTabsBezelBorder];
if ([[self tabViewItems] count] < 2) {
if ([mTabBar frame].size.height != 0)
tabVisibilityChanged = YES;
}
tabsVisible = NO;
}
else
{
if ( [self tabViewType] != NSTopTabsBezelBorder )
{
[self setTabViewType:NSTopTabsBezelBorder];
} else {
if ([mTabBar frame].size.height == 0)
tabVisibilityChanged = YES;
}
tabsVisible = YES;
}
// tell the tabs that visibility changed
NSArray* tabViewItems = [self tabViewItems];
for (unsigned int i = 0; i < [tabViewItems count]; i ++)
{
for (unsigned int i = 0; i < [tabViewItems count]; i ++) {
NSTabViewItem* tabItem = [tabViewItems objectAtIndex:i];
if ([tabItem isMemberOfClass:[BrowserTabViewItem class]])
[(BrowserTabViewItem*)tabItem updateTabVisibility:tabsVisible];
}
if (tabVisibilityChanged)
{
[[[[self window] windowController] bookmarkToolbar] setDrawBottomBorder:!tabsVisible];
if (tabVisibilityChanged) {
NSRect newTabBarFrame = [mTabBar frame];
newTabBarFrame.size.height = tabsVisible ? [mTabBar tabBarHeight]:0.0;
[mTabBar setFrame:newTabBarFrame];
// tell the superview to resize its subviews
[[self superview] resizeSubviewsWithOldSize:[[self superview] frame].size];
[self setNeedsDisplay:YES];
}
}
}
}
//
// -getExtraTopSpace
//
// return the gap we want to have to make us display correctly. Note the tab dimensions
// changed in panther so we have to use different constants.
//
- (float)getExtraTopSpace;
{
const float kPantherAppKit = 743.0;
const float kTabsVisibleTopGap = 4.0; // space above the tabs
const float kTabsVisibleTopGapPanther = 0.0; // no gap above tabs on panther
const float kTabsInvisibleTopGap = -7.0; // space removed to push tab content up when no tabs are visible
return ([self tabsVisible]) ?
((NSAppKitVersionNumber >= kPantherAppKit) ? kTabsVisibleTopGapPanther : kTabsVisibleTopGap) : kTabsInvisibleTopGap;
}
- (BOOL)tabsVisible
{
@ -371,7 +362,10 @@
NSArray* pasteBoardTypes = [[sender draggingPasteboard] types];
[self hideDragDestinationIndicator];
if (!overTabViewItem)
// if there's no tabviewitem at the point within our view, check the tabbar as well.
overTabViewItem = [mTabBar tabViewItemAtPoint:[sender draggingLocation]];
if ([pasteBoardTypes containsObject: @"MozBookmarkType"])
{
NSArray* draggedItems = [NSArray pointerArrayFromDataArrayForMozBookmarkDrop:[[sender draggingPasteboard] propertyListForType: @"MozBookmarkType"]];

9
camino/src/browser/BrowserTabViewItem.h
View File

@ -42,6 +42,8 @@
// a subclass of IconTabViewItem that handles dragging of site icons
@class BrowserTabItemContainerView;
@class TruncatingTextAndImageCell;
@class TabButtonCell;
@interface BrowserTabViewItem : IconTabViewItem
{
@ -57,11 +59,18 @@
- (NSView*)tabItemContentsView;
- (int)tag;
- (void)setTabIcon:(NSImage *)newIcon isDraggable:(BOOL)draggable;
- (TruncatingTextAndImageCell *)labelCell;
- (TabButtonCell *)tabButtonCell;
// call to start and stop the progress animation on this tab
- (void)startLoadAnimation;
- (void)stopLoadAnimation;
// call before removing to clean up close button and progress spinner
- (void)willBeRemoved:(BOOL)remove;
- (NSButton *)closeButton;
+ (NSImage*)closeIcon;
+ (NSImage*)closeIconPressed;

285
camino/src/browser/BrowserTabViewItem.mm
View File

@ -41,10 +41,13 @@
#import "NSPasteboard+Utils.h"
#import "BrowserTabViewItem.h"
#import "BrowserTabView.h"
#import "CHBrowserView.h"
#import "MainController.h"
#import "BrowserWindowController.h"
#import "TruncatingTextAndImageCell.h"
#import "TabButtonCell.h"
// we cannot use the spinner before 10.2, so don't allow it. This is the
// version of appkit in 10.2 (taken from the 10.3 SDK headers which we cannot use).
@ -58,176 +61,20 @@ const double kJaguarAppKitVersion = 663;
#pragma mark -
// XXX move this to a new file
@interface NSTruncatingTextAndImageCell : NSCell
{
NSImage *mImage;
NSMutableString *mTruncLabelString;
int mLabelStringWidth; // -1 if not known
float mImagePadding;
float mImageSpace;
float mImageAlpha;
float mRightGutter; // leave space for an icon on the right
BOOL mImageIsVisible;
}
- (id)initTextCell:(NSString*)aString;
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView;
- (void)setImagePadding:(float)padding;
- (void)setImageSpace:(float)space;
- (void)setImageAlpha:(float)alpha;
- (void)setRightGutter:(float)rightPadding;
- (void)setImageVisible:(BOOL)visible;
- (void)setImage:(NSImage *)anImage;
- (NSImage *)image;
@end
@implementation NSTruncatingTextAndImageCell
- (id)initTextCell:(NSString*)aString
{
if ((self = [super initTextCell:aString]))
{
mLabelStringWidth = -1;
mImagePadding = 0;
mImageSpace = 2;
mRightGutter = 0.0;
mImageIsVisible = NO;
}
return self;
}
- (void)dealloc
{
[mImage release];
[mTruncLabelString release];
[super dealloc];
}
- copyWithZone:(NSZone *)zone
{
NSTruncatingTextAndImageCell *cell = (NSTruncatingTextAndImageCell *)[super copyWithZone:zone];
cell->mImage = [mImage retain];
cell->mTruncLabelString = nil;
cell->mLabelStringWidth = -1;
cell->mRightGutter = mRightGutter;
cell->mImageIsVisible = mImageIsVisible;
return cell;
}
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView
{
NSRect textRect = cellFrame;
NSRect imageRect;
// we always reserve space for the image, even if there isn't one
// assume the image rect is always square
float imageWidth = NSHeight(cellFrame) - 2 * mImagePadding;
NSDivideRect(cellFrame, &imageRect, &textRect, imageWidth, NSMinXEdge);
if (mImage && mImageIsVisible)
{
NSRect imageSrcRect = NSZeroRect;
imageSrcRect.size = [mImage size];
[mImage drawInRect:NSInsetRect(imageRect, mImagePadding, mImagePadding)
fromRect:imageSrcRect operation:NSCompositeSourceOver fraction:mImageAlpha];
}
// remove image space
NSDivideRect(textRect, &imageRect, &textRect, mImageSpace, NSMinXEdge);
int cellWidth = (int)NSWidth(textRect) - (int)mRightGutter;
NSDictionary *cellAttributes = [[self attributedStringValue] attributesAtIndex:0 effectiveRange:nil];
if (mLabelStringWidth != cellWidth || !mTruncLabelString)
{
[mTruncLabelString release];
mTruncLabelString = [[NSMutableString alloc] initWithString:[self stringValue]];
[mTruncLabelString truncateToWidth:cellWidth at:kTruncateAtEnd withAttributes:cellAttributes];
mLabelStringWidth = cellWidth;
}
[mTruncLabelString drawInRect:textRect withAttributes:cellAttributes];
}
- (void)setStringValue:(NSString *)aString
{
if (![aString isEqualToString:[self stringValue]])
{
[mTruncLabelString release];
mTruncLabelString = nil;
}
[super setStringValue:aString];
}
- (void)setAttributedStringValue:(NSAttributedString *)attribStr
{
if (![attribStr isEqualToAttributedString:[self attributedStringValue]])
{
[mTruncLabelString release];
mTruncLabelString = nil;
}
[super setAttributedStringValue:attribStr];
}
- (void)setImage:(NSImage *)anImage
{
if (anImage != mImage)
{
[mImage release];
mImage = [anImage retain];
}
}
- (void)setImageVisible:(BOOL)visible
{
mImageIsVisible = visible;
}
- (NSImage *)image
{
return mImage;
}
- (void)setImagePadding:(float)padding
{
mImagePadding = padding;
}
- (void)setImageSpace:(float)space
{
mImageSpace = space;
}
- (void)setImageAlpha:(float)alpha
{
mImageAlpha = alpha;
}
- (void)setRightGutter:(float)rightPadding
{
mRightGutter = rightPadding;
}
@end
#pragma mark -
// a container view for the items in the tab view item. We use a subclass of
// NSView to handle drag and drop, and context menus
@interface BrowserTabItemContainerView : NSView
{
BrowserTabViewItem* mTabViewItem;
NSTruncatingTextAndImageCell* mLabelCell;
TruncatingTextAndImageCell* mLabelCell;
TabButtonCell* mTabButtonCell;
BOOL mIsDropTarget;
BOOL mSelectTabOnMouseUp;
}
- (NSTruncatingTextAndImageCell*)labelCell;
- (TruncatingTextAndImageCell*)labelCell;
- (TabButtonCell*)tabButtonCell;
- (void)showDragDestinationIndicator;
- (void)hideDragDestinationIndicator;
@ -244,11 +91,11 @@ const double kJaguarAppKitVersion = 663;
mTabViewItem = tabViewItem;
mLabelCell = [[NSTruncatingTextAndImageCell alloc] init];
mLabelCell = [[TruncatingTextAndImageCell alloc] init];
[mLabelCell setControlSize:NSSmallControlSize]; // doesn't work?
[mLabelCell setImagePadding:0.0];
[mLabelCell setImageSpace:2.0];
[mLabelCell setRightGutter:kCloseButtonWidth];
mTabButtonCell = [[TabButtonCell alloc] initFromTabViewItem:mTabViewItem];
[self registerForDraggedTypes:[NSArray arrayWithObjects:
@"MozURLType", @"MozBookmarkType", NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
@ -259,14 +106,20 @@ const double kJaguarAppKitVersion = 663;
- (void)dealloc
{
[mLabelCell release];
[mTabButtonCell release];
[super dealloc];
}
- (NSTruncatingTextAndImageCell*)labelCell
- (TruncatingTextAndImageCell*)labelCell
{
return mLabelCell;
}
- (TabButtonCell *)tabButtonCell
{
return mTabButtonCell;
}
// allow clicks in background windows to switch tabs
- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
{
@ -278,19 +131,6 @@ const double kJaguarAppKitVersion = 663;
return NO;
}
- (void)drawRect:(NSRect)aRect
{
[mLabelCell drawWithFrame:[self bounds] inView:self];
if (mIsDropTarget)
{
NSRect hilightRect = NSOffsetRect(NSInsetRect([self bounds], 1.0, 0), -1.0, 0);
NSBezierPath* dropTargetOutline = [NSBezierPath bezierPathWithRoundCorneredRect:hilightRect cornerRadius:4.0];
[[NSColor colorWithCalibratedWhite:0.0 alpha:0.15] set];
[dropTargetOutline fill];
}
}
- (void)showDragDestinationIndicator
{
if (!mIsDropTarget)
@ -381,7 +221,7 @@ const double kJaguarAppKitVersion = 663;
// NSResponder methods
- (void)mouseDown:(NSEvent *)theEvent
{
NSRect iconRect = NSMakeRect(0, 0, 16, 16);
NSRect iconRect = [self convertRect: [mLabelCell imageFrame] fromView: nil];
NSPoint localPoint = [self convertPoint: [theEvent locationInWindow] fromView: nil];
// this is a bit evil. Because the tab view's mouseDown captures the mouse, we'll
@ -396,7 +236,7 @@ const double kJaguarAppKitVersion = 663;
}
mSelectTabOnMouseUp = NO;
[[self nextResponder] mouseDown:theEvent];
[[mTabViewItem tabView] selectTabViewItem:mTabViewItem];
}
- (void)mouseUp:(NSEvent *)theEvent
@ -412,7 +252,7 @@ const double kJaguarAppKitVersion = 663;
- (void)mouseDragged:(NSEvent*)theEvent
{
NSRect iconRect = NSMakeRect(0, 0, 16, 16);
NSRect iconRect = [self convertRect: [mLabelCell imageFrame] fromView: nil];//NSMakeRect(0, 0, 16, 16);
NSPoint localPoint = [self convertPoint: [theEvent locationInWindow] fromView: nil];
if (!NSPointInRect(localPoint, iconRect) || ![mTabViewItem draggable])
@ -420,25 +260,27 @@ const double kJaguarAppKitVersion = 663;
[[self nextResponder] mouseDragged:theEvent];
return;
}
mSelectTabOnMouseUp = NO;
CHBrowserView* browserView = (CHBrowserView*)[mTabViewItem view];
NSString *url = [browserView getCurrentURLSpec];
NSString *title = [mLabelCell stringValue];
NSString *cleanedTitle = [title stringByReplacingCharactersInSet:[NSCharacterSet controlCharacterSet] withString:@" "];
NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
[pboard declareURLPasteboardWithAdditionalTypes:[NSArray array] owner:self];
[pboard setDataForURL:url title:cleanedTitle];
NSPoint dragOrigin = [self frame].origin;
dragOrigin.y += [self frame].size.height;
[self dragImage: [MainController createImageForDragging:[mLabelCell image] title:title]
at:NSMakePoint(0, 0) offset:NSMakeSize(0, 0)
event:theEvent pasteboard:pboard source:self slideBack:YES];
// only initiate the drag if the original mousedown was in the right place... implied by mSelectTabOnMouseUp
if (mSelectTabOnMouseUp) {
mSelectTabOnMouseUp = NO;
CHBrowserView* browserView = (CHBrowserView*)[mTabViewItem view];
NSString *url = [browserView getCurrentURLSpec];
NSString *title = [mLabelCell stringValue];
NSString *cleanedTitle = [title stringByReplacingCharactersInSet:[NSCharacterSet controlCharacterSet] withString:@" "];
NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
[pboard declareURLPasteboardWithAdditionalTypes:[NSArray array] owner:self];
[pboard setDataForURL:url title:cleanedTitle];
NSPoint dragOrigin = [self frame].origin;
dragOrigin.y += [self frame].size.height;
[self dragImage: [MainController createImageForDragging:[mLabelCell image] title:title]
at:localPoint offset:NSMakeSize(0, 0)
event:theEvent pasteboard:pboard source:self slideBack:YES];
}
}
- (void)setMenu:(NSMenu *)aMenu
@ -449,6 +291,7 @@ const double kJaguarAppKitVersion = 663;
[[aMenu itemAtIndex:i] setTag:[mTabViewItem tag]];
[super setMenu:aMenu];
[mTabButtonCell setMenu:aMenu];
}
@end
@ -472,7 +315,7 @@ const double kJaguarAppKitVersion = 663;
// create progress wheel. keep a strong ref as view goes in and out of view hierarchy. We
// cannot use |NSProgressIndicatorSpinningStyle| on 10.1, so don't bother even creating it
// and let all the calls to it be no-ops elsewhere in this class (prevents clutter, imho).
#if 0
#if USE_PROGRESS_SPINNER
// the progress spinner causes content to shear when scrolling because of
// redraw problems on jaguar and panther. Removing until we can fix it. (bug 203349)
if (NSAppKitVersionNumber >= kJaguarAppKitVersion) {
@ -497,7 +340,7 @@ const double kJaguarAppKitVersion = 663;
[mCloseButton setTarget:self];
[mCloseButton setAction:@selector(closeTab)];
[mCloseButton setAutoresizingMask:NSViewMinXMargin];
[mTabContentsView addSubview:mCloseButton];
[mCloseButton retain];
[[self tabView] setAutoresizesSubviews:YES];
@ -541,8 +384,6 @@ const double kJaguarAppKitVersion = 663;
- (void)closeTab
{
[[self view] windowClosed];
[mCloseButton removeFromSuperview];
[mProgressWheel removeFromSuperview];
[[self tabView] removeTabViewItem:self];
}
@ -582,6 +423,7 @@ const double kJaguarAppKitVersion = 663;
{
NSAttributedString* labelString = [[[NSAttributedString alloc] initWithString:label attributes:mLabelAttributes] autorelease];
[[mTabContentsView labelCell] setAttributedStringValue:labelString];
[(BrowserTabView *)[self tabView] refreshTabBar:NO];
[super setLabel:label];
}
@ -591,11 +433,21 @@ const double kJaguarAppKitVersion = 663;
return [[mTabContentsView labelCell] stringValue];
}
- (TruncatingTextAndImageCell *)labelCell
{
return [mTabContentsView labelCell];
}
- (TabButtonCell *)tabButtonCell
{
return [mTabContentsView tabButtonCell];
}
-(void)setTabIcon:(NSImage *)newIcon
{
[super setTabIcon:newIcon];
[[mTabContentsView labelCell] setImage:mTabIcon];
[mTabContentsView setNeedsDisplay:YES];
[(BrowserTabView *)[self tabView] refreshTabBar:NO];
}
- (void)setTabIcon:(NSImage *)newIcon isDraggable:(BOOL)draggable
@ -605,18 +457,27 @@ const double kJaguarAppKitVersion = 663;
[[mTabContentsView labelCell] setImageAlpha:(draggable ? 1.0 : 0.6)];
}
- (void)willBeRemoved:(BOOL)remove
{
if (remove) {
[mCloseButton removeFromSuperview];
[mProgressWheel removeFromSuperview];
}
}
#pragma mark -
- (void)startLoadAnimation
{
#if USE_PROGRESS_SPINNER
// supress the tab icon while the spinner is over it
[[mTabContentsView labelCell] setImageVisible: NO];
[mTabContentsView setNeedsDisplay:YES];
// add spinner to tab view and start animation
[mTabContentsView addSubview:mProgressWheel];
[[mTabContentsView labelCell] addProgressIndicator:mProgressWheel];
[(BrowserTabView *)[self tabView] refreshTabBar:NO];
[mProgressWheel startAnimation:self];
#else
// allow the favicon to display if there's no spinner
[[mTabContentsView labelCell] setImageVisible: YES];
[mTabContentsView setNeedsDisplay:YES];
#endif
}
@ -629,10 +490,16 @@ const double kJaguarAppKitVersion = 663;
#if USE_PROGRESS_SPINNER
// stop animation and remove spinner from tab view
[mProgressWheel stopAnimation:self];
[mProgressWheel removeFromSuperview];
[[mTabContentsView labelCell] removeProgressIndicator];
[(BrowserTabView *)[self tabView] refreshTabBar:NO];
#endif
}
- (NSButton *) closeButton
{
return mCloseButton;
}
#pragma mark -
+ (NSImage*)closeIcon

2
camino/src/browser/BrowserWindowController.mm
View File

@ -2359,6 +2359,7 @@ static NSArray* sToolbarDefaults = nil;
// Connect up the new view
mBrowserView = [aTabViewItem view];
[mTabBrowser refreshTabBar:YES];
// Make the new view the primary content area.
[mBrowserView makePrimaryBrowserView: mURLBar status: mStatus windowController: self];
@ -2367,6 +2368,7 @@ static NSArray* sToolbarDefaults = nil;
- (void)tabViewDidChangeNumberOfTabViewItems:(NSTabView *)aTabView
{
[[NSApp delegate] fixCloseMenuItemKeyEquivalents];
[mTabBrowser refreshTabBar:YES];
}
-(id)getTabBrowser

58
camino/src/extensions/RolloverTrackingCell.h Normal file
View File

@ -0,0 +1,58 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is tab UI for Camino.
*
* The Initial Developer of the Original Code is
* Geoff Beier.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import <Cocoa/Cocoa.h>
@interface RolloverTrackingCell : NSCell {
NSDictionary *mUserData;
NSTrackingRectTag mTrackingTag;
NSRect mFrame;
BOOL mMouseWithin;
BOOL mIsDragTarget;
}
-(void)setFrame:(NSRect)newFrame;
-(NSRect)frame;
-(NSSize)size;
-(BOOL)mouseWithin;
-(void)addTrackingRectInView:(NSView*)aView withFrame:(NSRect)trackingRect cursorLocation:(NSPoint)currentLocation;
-(void)removeTrackingRectFromView:(NSView*)aView;
-(void)setDragTarget:(BOOL)isDragTarget;
-(BOOL)dragTarget;
@end

120
camino/src/extensions/RolloverTrackingCell.mm Normal file
View File

@ -0,0 +1,120 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is tab UI for Camino.
*
* The Initial Developer of the Original Code is
* Geoff Beier.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import "RolloverTrackingCell.h"
@implementation RolloverTrackingCell
-(void)dealloc
{
[mUserData release];
[super dealloc];
}
-(void)setFrame:(NSRect)newFrame
{
mFrame = newFrame;
}
-(NSRect)frame
{
return mFrame;
}
-(NSSize)size
{
return mFrame.size;
}
-(BOOL)mouseWithin
{
return mMouseWithin;
}
-(void)addTrackingRectInView:(NSView *)aView withFrame:(NSRect)trackingRect cursorLocation:(NSPoint)currentLocation
{
if (mTrackingTag != 0)
[self removeTrackingRectFromView: aView];
mUserData = [[NSDictionary dictionaryWithObjectsAndKeys:aView, @"view", nil] retain];
mMouseWithin = NSPointInRect(currentLocation, trackingRect);
mTrackingTag = [aView addTrackingRect:trackingRect owner:self userData:mUserData assumeInside:mMouseWithin];
}
- (void)removeTrackingRectFromView:(NSView *)aView
{
[aView removeTrackingRect:mTrackingTag];
mTrackingTag = 0;
[mUserData release];
mUserData = nil;
}
- (void)mouseEntered:(NSEvent *)theEvent
{
NSDictionary *userData = (NSDictionary *)[theEvent userData];
NSView *view = [userData objectForKey:@"view"];
mMouseWithin = YES;
// only act on the mouseEntered if the view is active or accepts the first mouse click
if ([[view window] isKeyWindow] || [view acceptsFirstMouse:theEvent])
[view setNeedsDisplayInRect:[self frame]];
}
- (void)mouseExited:(NSEvent*)theEvent
{
NSDictionary *userData = (NSDictionary*)[theEvent userData];
NSView *view = [userData objectForKey:@"view"];
mMouseWithin = NO;
// only act on the mouseExited if the view is active or accepts the first mouse click
if ([[view window] isKeyWindow] || [view acceptsFirstMouse:theEvent])
[view setNeedsDisplayInRect:[self frame]];
}
- (void)setDragTarget:(BOOL)isDragTarget
{
mIsDragTarget = isDragTarget;
// we may be getting this in lieu of a mouse enter/exit event
mMouseWithin = isDragTarget;
}
- (BOOL)dragTarget
{
return mIsDragTarget;
}
@end

55
camino/src/extensions/TabButtonCell.h Normal file
View File

@ -0,0 +1,55 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is tab UI for Camino.
*
* The Initial Developer of the Original Code is
* Geoff Beier.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import <Cocoa/Cocoa.h>
#import "RolloverTrackingCell.h"
#import "BrowserTabViewItem.h"
@interface TabButtonCell : RolloverTrackingCell {
BrowserTabViewItem *mTabViewItem;
BOOL mNeedsDivider;
}
-(id)initFromTabViewItem:(BrowserTabViewItem*)tabViewItem;
-(BOOL)isSelected;
-(BrowserTabViewItem*)tabViewItem;
-(BOOL)willTrackMouse:(NSEvent*)theEvent inRect:(NSRect)cellFrame ofView:(NSView*)controlView;
-(void)hideCloseButton;
-(void)setDrawDivider:(BOOL)willDraw;
@end

194
camino/src/extensions/TabButtonCell.mm Normal file
View File

@ -0,0 +1,194 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is tab UI for Camino.
*
* The Initial Developer of the Original Code is
* Geoff Beier.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import "TabButtonCell.h"
#import "TruncatingTextAndImageCell.h"
#import "BrowserTabBarView.h"
static const int kTabLeftMargin = 4; //distance between left edge and close button
static const int kTabCloseButtonPad = 2; //distance between close button and label
static const int kTabRightMargin = 4; //distance between label cell and right edge
static const int kTabBottomPad = 4; // number of pixels to offset from the bottom
static const int kTabSelectOffset = 1; //number of pixels to drop everything down when selected
static NSImage * tabLeft = nil;
static NSImage * tabRight = nil;
static NSImage * activeTabBg = nil;
static NSImage * tabMouseOverBg = nil;
static NSImage * tabButtonDividerImage = nil;
@interface TabButtonCell (PRIVATE)
-(void)loadImages;
@end
// these are the "tabs" for the tabless tab view
// to keep them lighter weight, they are not responsible for creating/maintaining much of anything
// the BrowserTabViewItem maintains the spinner, favicon, label and close button... this just positions
// them and brings them in and out of view, as well as painting itself and (TODO) handles dnd.
@implementation TabButtonCell
-(id)initFromTabViewItem:(BrowserTabViewItem *)tabViewItem
{
[super init];
mTabViewItem = [tabViewItem retain];
mNeedsDivider = YES;
return self;
}
// XXX does the menu need released here??
-(void)dealloc
{
[[mTabViewItem closeButton] removeFromSuperview];
[mTabViewItem release];
[super dealloc];
}
-(BOOL)isSelected
{
return ([mTabViewItem tabState] == NSSelectedTab);
}
-(BrowserTabViewItem *)tabViewItem
{
return mTabViewItem;
}
// TODO
-(BOOL)willTrackMouse:(NSEvent*)theEvent inRect:(NSRect)cellFrame ofView:(NSView*)controlView
{
return NO;
}
-(void)drawWithFrame:(NSRect)rect inView:(NSView*)controlView
{
if (!tabLeft || !tabRight || !activeTabBg || !tabMouseOverBg || !tabButtonDividerImage)
[self loadImages];
// XXX is it worth it to see if the load failed? I don't think so, as if it did, the bundle is trashed and
// we have bigger problems
NSSize textSize = [mTabViewItem sizeOfLabel:NO];
NSSize buttonSize = [[mTabViewItem closeButton] frame].size;
// center based on the larger of the two heights if there's a difference
float maxHeight = textSize.height > buttonSize.height ? textSize.height : buttonSize.height;
NSRect buttonRect = NSMakeRect(rect.origin.x + kTabLeftMargin,
rect.origin.y + (int)((rect.size.height - kTabBottomPad - maxHeight)/2.0 + kTabBottomPad),
buttonSize.width, buttonSize.height);
NSRect labelRect = NSMakeRect(NSMaxX(buttonRect) + kTabCloseButtonPad,
rect.origin.y + (int)((rect.size.height - kTabBottomPad - maxHeight)/2.0 + kTabBottomPad),
rect.size.width - (NSWidth(buttonRect) +kTabCloseButtonPad+kTabLeftMargin+kTabRightMargin),
textSize.height);
TruncatingTextAndImageCell *labelCell = [mTabViewItem labelCell];
// make sure the close button and the favicon line up properly
[labelCell setImagePadding:0.0];
[labelCell setMaxImageHeight:buttonSize.height];
if (mNeedsDivider) {
rect.size.width -= [tabButtonDividerImage size].width;
[tabButtonDividerImage compositeToPoint:NSMakePoint(NSMaxX(rect), rect.origin.y)
operation:NSCompositeSourceOver];
}
if ([mTabViewItem tabState] == NSSelectedTab) {
// move things down a little, to give the impression of being pulled forward
labelRect.origin.y -= kTabSelectOffset;
buttonRect.origin.y -= kTabSelectOffset;
// XXX would it be better to maintain a CGContext and do a real gradient here?
// it sounds heavier, but I haven't tested to be sure. This looks just as nice so long as
// the tabbar height is fixed.
NSRect bgRect = NSMakeRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
bgRect.origin.x += [tabLeft size].width;
bgRect.size.width -= ([tabRight size].width + [tabLeft size].width);
[activeTabBg paintTiledInRect:rect];
[tabLeft compositeToPoint:NSMakePoint(rect.origin.x, rect.origin.y) operation:NSCompositeSourceOver];
[tabRight compositeToPoint:NSMakePoint(NSMaxX(bgRect), bgRect.origin.y) operation:NSCompositeSourceOver];
} else if ([self mouseWithin] && ![self dragTarget]) {
[tabMouseOverBg paintTiledInRect:rect];
}
// TODO: Make this look nicer
if ([self dragTarget]) {
[[NSColor colorWithCalibratedRed:0.7 green:0.8 blue:1.0 alpha:1.0] set];
rect.origin.y += kTabBottomPad;
NSRectFill(rect);
}
NSButton *closeButton = [mTabViewItem closeButton];
if (controlView != [closeButton superview]) {
[controlView addSubview:closeButton];
}
[closeButton setFrame:buttonRect];
// XXX is this necessary, or even good?
[closeButton setNeedsDisplay:YES];
[labelCell drawInteriorWithFrame:labelRect inView:controlView];
}
-(void)addTrackingRectInView:(NSView *)aView withFrame:(NSRect)trackingRect cursorLocation:(NSPoint)currentLocation
{
[super addTrackingRectInView:aView withFrame:trackingRect cursorLocation:currentLocation];
}
-(void)removeTrackingRectFromView:(NSView *)aView
{
[super removeTrackingRectFromView:aView];
}
-(void)hideCloseButton
{
NSButton * closeButton = [mTabViewItem closeButton];
if ([closeButton superview] != nil)
[closeButton removeFromSuperview];
}
-(void)setDrawDivider:(BOOL)willDraw
{
mNeedsDivider = willDraw;
}
-(void)loadImages
{
if (!tabLeft) tabLeft = [[NSImage imageNamed:@"tab_left_side"] retain];
if (!tabRight) tabRight = [[NSImage imageNamed:@"tab_right_side"] retain];
if (!activeTabBg) activeTabBg = [[NSImage imageNamed:@"tab_active_bg"] retain];
if (!tabMouseOverBg) tabMouseOverBg = [[NSImage imageNamed:@"tab_hover"] retain];
if (!tabButtonDividerImage) tabButtonDividerImage = [[NSImage imageNamed:@"tab_button_divider"] retain];
}
@end

71
camino/src/extensions/TruncatingTextAndImageCell.h Normal file
View File

@ -0,0 +1,71 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
* Based on BrowserTabViewItem.mm by Simon Fraser <sfraser@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import <Cocoa/Cocoa.h>
@interface TruncatingTextAndImageCell : NSCell
{
NSImage *mImage;
NSMutableString *mTruncLabelString;
int mLabelStringWidth; // -1 if not known
float mImagePadding;
float mImageSpace;
float mImageAlpha;
float mRightGutter; // leave space for an icon on the right
BOOL mImageIsVisible;
float mMaxImageHeight;
NSRect mImageFrame;
NSProgressIndicator *mProgressIndicator;
}
-(id)initTextCell:(NSString*)aString;
-(void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView;
-(void)setImagePadding:(float)padding;
-(void)setImageSpace:(float)space;
-(void)setImageAlpha:(float)alpha;
-(void)setMaxImageHeight:(float)height;
-(void)setImageVisible:(BOOL)visible;
-(void)setRightGutter:(float)rightPadding;
-(void)setImage:(NSImage *)anImage;
-(NSImage*)image;
-(NSRect)imageFrame;
-(void)addProgressIndicator:(NSProgressIndicator *)indicator;
-(void)removeProgressIndicator;
@end

215
camino/src/extensions/TruncatingTextAndImageCell.mm Normal file
View File

@ -0,0 +1,215 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Geoff Beier <me@mollyandgeoff.com>
* Based on BrowserTabViewItem.mm by Simon Fraser <sfraser@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#import "TruncatingTextAndImageCell.h"
#import "NSString+Utils.h"
// this was in BrowserTabViewItem, but the comment stated that it needed to be moved
// since I needed it outside BrowserTabViewItem, I moved it. I also renamed it since it was
// easy and I'm confused by non-Apple names that start with NS :-)
@implementation TruncatingTextAndImageCell
-(id)initTextCell:(NSString*)aString
{
if ((self = [super initTextCell:aString])) {
mLabelStringWidth = -1;
mImagePadding = 0;
mImageSpace = 2;
mMaxImageHeight = 16;
mRightGutter = 0.0;
mImageIsVisible = NO;
}
return self;
}
-(void)dealloc
{
[mProgressIndicator removeFromSuperview];
[mProgressIndicator release];
[mImage release];
[mTruncLabelString release];
[super dealloc];
}
-copyWithZone:(NSZone *)zone
{
TruncatingTextAndImageCell *cell = (TruncatingTextAndImageCell *)[super copyWithZone:zone];
cell->mImage = [mImage retain];
cell->mTruncLabelString = nil;
cell->mLabelStringWidth = -1;
cell->mRightGutter = mRightGutter;
cell->mImageIsVisible = mImageIsVisible;
return cell;
}
-(NSRect )imageFrame
{
return mImageFrame;
}
// currently draws progress indicator or favicon followed by label
-(void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView
{
NSRect textRect = cellFrame;
NSRect imageRect;
// we always reserve space for the image, even if there isn't one
// assume the image rect is always square
float imageWidth = NSHeight(cellFrame) - 2 * mImagePadding;
// draw the progress indicator if we have a reference to it, otherwise draw the favicon
if (mProgressIndicator) {
NSDivideRect(cellFrame, &textRect, &imageRect, NSWidth(cellFrame) - imageWidth, NSMinXEdge);
if (controlView != [mProgressIndicator superview]) {
[controlView addSubview:mProgressIndicator];
}
[mProgressIndicator setFrame:imageRect];
[mProgressIndicator setNeedsDisplay:YES];
}
else if (mImage && mImageIsVisible) {
//Put the favicon to the left of the text
NSDivideRect(cellFrame,&imageRect,&textRect,imageWidth,NSMinXEdge);
NSRect imageSrcRect = NSZeroRect;
imageSrcRect.size = [mImage size];
float imagePadding = mImagePadding;
// I don't think this will be needed in practice, but if the favicon is smaller than
// our planned size, it should be padded rather than left on the bottom of the cell IMO
if (imageRect.size.height > mMaxImageHeight)
imagePadding += (imageRect.size.height - mMaxImageHeight);
[mImage drawInRect:NSInsetRect(imageRect, mImagePadding, mImagePadding)
fromRect:imageSrcRect operation:NSCompositeSourceOver fraction:mImageAlpha];
}
else {
NSDivideRect(cellFrame,&imageRect,&textRect,imageWidth,NSMinXEdge);
}
mImageFrame = [controlView convertRect:imageRect toView:nil];
// remove image space
NSDivideRect(textRect, &imageRect, &textRect, mImageSpace, NSMinXEdge);
int cellWidth = (int)NSWidth(textRect) - (int)mRightGutter;
NSDictionary *cellAttributes = [[self attributedStringValue] attributesAtIndex:0 effectiveRange:nil];
if (mLabelStringWidth != cellWidth || !mTruncLabelString) {
[mTruncLabelString release];
mTruncLabelString = [[NSMutableString alloc] initWithString:[self stringValue]];
[mTruncLabelString truncateToWidth:cellWidth at:kTruncateAtEnd withAttributes:cellAttributes];
mLabelStringWidth = cellWidth;
}
[mTruncLabelString drawInRect:textRect withAttributes:cellAttributes];
}
-(void)setStringValue:(NSString *)aString
{
if (![aString isEqualToString:[self stringValue]]) {
[mTruncLabelString release];
mTruncLabelString = nil;
}
[super setStringValue:aString];
}
-(void)setAttributedStringValue:(NSAttributedString *)attribStr
{
if (![attribStr isEqualToAttributedString:[self attributedStringValue]]) {
[mTruncLabelString release];
mTruncLabelString = nil;
}
[super setAttributedStringValue:attribStr];
}
-(void)setImage:(NSImage *)anImage
{
if (anImage != mImage) {
[mImage release];
mImage = [anImage retain];
}
}
-(void)setImageVisible:(BOOL)visible
{
mImageIsVisible = visible;
}
-(NSImage *)image
{
return mImage;
}
-(void)setImagePadding:(float)padding
{
mImagePadding = padding;
}
-(void)setRightGutter:(float)rightPadding
{
mRightGutter = rightPadding;
}
-(void)setImageSpace:(float)space
{
mImageSpace = space;
}
-(void)setImageAlpha:(float)alpha
{
mImageAlpha = alpha;
}
// called by BrowserTabViewItem when progress display should start
- (void)addProgressIndicator:(NSProgressIndicator*)indicator
{
mProgressIndicator = [indicator retain];
}
// called by BrowserTabviewItem when progress display is finished
// and the progress indicator should be replaced with the favicon
- (void)removeProgressIndicator
{
[mProgressIndicator removeFromSuperview];
[mProgressIndicator release];
mProgressIndicator = nil;
}
// called by TabButtonCell to constrain the height of the favicon to the height of the close button
// for best results, both should be 16x16
- (void)setMaxImageHeight:(float)height
{
mMaxImageHeight = height;
}
@end