Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 312959: avoid hang showing tooltip on a newly added bookmark toolbar item by ensuring that the bookmark has its title and url before notifications are fired for it, and avoiding "\n\n" tooltip strings. r=mento.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@182567 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
smfr%smfr.org
2005-10-20 02:03:20 +00:00
parent 8a7bc976c5
commit 91b335b9bb
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/camino/src/bookmarks/BookmarkButton.mm
View File

@@ -109,9 +109,14 @@
return;
}
[self setAction:@selector(openBookmark:)];
[self setToolTip:[NSString stringWithFormat:NSLocalizedString(@"BookmarkButtonTooltipFormat", @""),
NSString* tooltipString = [NSString stringWithFormat:NSLocalizedString(@"BookmarkButtonTooltipFormat", @""),
[bookmarkItem title],
[bookmarkItem url]]];
[bookmarkItem url]];
// using "\n\n" as a tooltip string causes Cocoa to hang when displaying the tooltip,
// so be paranoid about not doing that
if (![tooltipString isEqualToString:@"\n\n"])
[self setToolTip:tooltipString];
}
else {
[[self cell] setClickHoldTimeout:0.5];

4
mozilla/camino/src/bookmarks/BookmarkFolder.mm
View File

@@ -548,8 +548,6 @@ NSString* const BookmarkFolderDockMenuChangeNotificaton = @"bf_dmc";
{
if (![self isRoot]) {
Bookmark *theBookmark = [[Bookmark alloc] init];
[self insertChild:theBookmark atIndex:aPosition isMove:NO];
[theBookmark release];
[theBookmark setTitle:aTitle];
[theBookmark setKeyword:aKeyword];
[theBookmark setUrl:aURL];
@@ -557,6 +555,8 @@ NSString* const BookmarkFolderDockMenuChangeNotificaton = @"bf_dmc";
[theBookmark setLastVisit:aDate];
[theBookmark setStatus:aStatus];
[theBookmark setIsSeparator:aSeparator];
[self insertChild:theBookmark atIndex:aPosition isMove:NO];
[theBookmark release];
return theBookmark;
}
return nil;