From 37bef9f470f2a368319efd27c79ba21f2a2d0b86 Mon Sep 17 00:00:00 2001 From: "stuart.morgan%alumni.case.edu" Date: Mon, 26 Oct 2009 16:50:17 +0000 Subject: [PATCH] Camino only - Bug 522919: Focus the bookmark manager correctly when switching to it from tab overview. sr=pink git-svn-id: svn://10.0.0.236/trunk@258792 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/src/browser/BrowserWindowController.mm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 133793b4157..80cd1fce648 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -5261,8 +5261,12 @@ public: [mSearchBar setEditable:YES]; // If we don't have focus anywhere useful when coming out of tab overview // mode (due to the view shuffling) set it on the content area. - if ([[[self window] firstResponder] isEqual:[self window]]) - [[self window] makeFirstResponder:[mBrowserView browserView]]; + if ([[[self window] firstResponder] isEqual:[self window]]) { + if ([self bookmarkManagerIsVisible]) + [[self bookmarkViewControllerForCurrentTab] focusSearchField]; + else + [[self window] makeFirstResponder:[mBrowserView browserView]]; + } } }