From 720fb2ace25467cdb0dfdefb3103e930dce0c29f Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Wed, 23 Apr 2003 16:47:11 +0000 Subject: [PATCH] make a textedit cell that leaves room for the proxy icon so that we can use a regular NSTextField for the url bar. from nhamblen@mac.com (bug 198095) git-svn-id: svn://10.0.0.236/trunk@141696 18797224-902f-48f8-a5cc-f745e15eee43 --- .../English.lproj/BrowserWindow.nib/info.nib | 16 +++-- .../BrowserWindow.nib/objects.nib | Bin 24634 -> 24500 bytes .../src/browser/AutoCompleteTextField.mm | 58 +++++++++++++++++- .../src/browser/BrowserWindowController.mm | 4 +- 4 files changed, 69 insertions(+), 9 deletions(-) diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index d8ddea7606d..91486112272 100644 --- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 263 57 653 383 0 0 1280 832 + 50 101 653 383 0 0 1024 746 IBEditorPositions 124 83 451 170 144 0 0 1280 832 160 - 478 172 195 666 0 0 1152 848 + 602 52 195 666 0 0 1024 746 28 542 342 195 457 0 0 1280 832 297 @@ -23,16 +23,16 @@ 463 268 375 213 264 0 0 1280 832 56 - 340 478 343 68 0 0 1024 746 + 355 485 314 64 0 0 1024 746 654 159 629 198 144 0 0 1280 832 731 185 277 654 459 0 0 1024 746 801 - 418 480 188 64 0 0 1024 746 + 418 469 201 79 0 0 1024 746 IBFramework Version - 291.0 + 286.0 IBGroupedObjects 7 @@ -45,7 +45,11 @@ 8 IBLockedObjects + IBOpenObjects + + 56 + IBSystem Version - 6I32 + 6L29 diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index 25cf222b66ae53a735261704bd447c653349eced..99c869ac50e6e9df9a8bc7d1794dada5d4518e90 100644 GIT binary patch literal 24500 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 literal 24634 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 diff --git a/mozilla/camino/src/browser/AutoCompleteTextField.mm b/mozilla/camino/src/browser/AutoCompleteTextField.mm index 179d8d43b99..e46b3527a60 100644 --- a/mozilla/camino/src/browser/AutoCompleteTextField.mm +++ b/mozilla/camino/src/browser/AutoCompleteTextField.mm @@ -47,8 +47,34 @@ static const int kFrameMargin = 1; { return YES; } + @end +#pragma mark - + +// +// AutoCompleteTextCell +// +// Text cell subclass used to make room for the proxy icon inside the textview +// +@interface AutoCompleteTextCell : NSTextFieldCell +@end + +@implementation AutoCompleteTextCell + +- (NSRect)drawingRectForBounds:(NSRect)theRect +{ + const float kProxIconOffset = 19.0; + + theRect.origin.x += kProxIconOffset; + theRect.size.width -= kProxIconOffset; + return [super drawingRectForBounds:theRect]; +} + +@end + +#pragma mark - + class AutoCompleteListener : public nsIAutoCompleteListener { public: @@ -75,6 +101,8 @@ private: NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) +#pragma mark - + //////////////////////////////////////////////////////////////////////// @interface AutoCompleteTextField(Private) - (void)cleanup; @@ -83,6 +111,27 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) @implementation AutoCompleteTextField ++ (Class) cellClass +{ + return [AutoCompleteTextCell class]; +} + +// This method shouldn't be necessary according to the docs. The superclass's +// constructors should read in the cellClass and build a properly configured +// instance on their own. Instead they ignore cellClass and build a NSTextFieldCell. +- (id)initWithCoder:(NSCoder *)coder +{ + [super initWithCoder:coder]; + AutoCompleteTextCell* cell = [[[AutoCompleteTextCell alloc] initTextCell:@""] autorelease]; + [cell setEditable:[self isEditable]]; + [cell setDrawsBackground:[self drawsBackground]]; + [cell setBordered:[self isBordered]]; + [cell setBezeled:[self isBezeled]]; + [cell setScrollable:YES]; + [self setCell:cell]; + return self; +} + - (void) awakeFromNib { NSTableColumn *column; @@ -119,8 +168,15 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [mTableView setTarget:self]; [mTableView setAction:@selector(onRowClicked:)]; - // Create the icon column if we have a proxy icon + // if we have a proxy icon if (mProxyIcon) { + // place the proxy icon on top of this view so we can see it + [mProxyIcon retain]; + [mProxyIcon removeFromSuperviewWithoutNeedingDisplay]; + [self addSubview:mProxyIcon]; + [mProxyIcon release]; + [mProxyIcon setFrameOrigin: NSMakePoint(3, 4)]; + // Create the icon column column = [[[NSTableColumn alloc] initWithIdentifier:@"icon"] autorelease]; [column setWidth:[mProxyIcon frame].origin.x + [mProxyIcon frame].size.width]; dataCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 14cde0a9a62..ac4f4f8e10c 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -772,8 +772,8 @@ static NSArray* sToolbarDefaults = nil; [toolbarItem setLabel:NSLocalizedString(@"Location", @"Location")]; [toolbarItem setPaletteLabel:NSLocalizedString(@"Location", @"Location")]; [toolbarItem setView:mLocationToolbarView]; - [toolbarItem setMinSize:NSMakeSize(128,20)]; - [toolbarItem setMaxSize:NSMakeSize(2560,32)]; + [toolbarItem setMinSize:NSMakeSize(128, NSHeight([mLocationToolbarView frame]))]; + [toolbarItem setMaxSize:NSMakeSize(2560, NSHeight([mLocationToolbarView frame]))]; [menuFormRep setTarget:self]; [menuFormRep setAction:@selector(performAppropriateLocationAction)];