Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 517866, restore focus check so that first visible content is searched for when finding, fixes most noticeable issue with finding in unstyled xml documents, r=neil

Browse Source
This commit is contained in:
Neil Deakin 2009-10-23 12:08:24 -04:00
parent d121e16fdd
commit 06ba6597bf
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
View File

@ -987,9 +987,9 @@ nsTypeAheadFind::Find(const nsAString& aSearchString, PRBool aLinksOnly,
// If false, we will scan from start of selection
isFirstVisiblePreferred = !atEnd && !mCaretBrowsingOn && isSelectionCollapsed;
if (isFirstVisiblePreferred) {
// Get focused content from esm. If it's null, the document is focused.
// If not, make sure the selection is in sync with the focus, so we can
// start our search from there.
// Get the focused content. If there is a focused node, ensure the
// selection is at that point. Otherwise, we will just want to start
// from the caret position or the beginning of the document.
nsPresContext* presContext = presShell->GetPresContext();
NS_ENSURE_TRUE(presContext, NS_OK);
@ -1002,8 +1002,17 @@ nsTypeAheadFind::Find(const nsAString& aSearchString, PRBool aLinksOnly,
nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
if (fm) {
fm->MoveCaretToFocus(window);
isFirstVisiblePreferred = PR_FALSE;
nsCOMPtr<nsIDOMElement> focusedElement;
nsCOMPtr<nsIDOMWindow> focusedWindow;
fm->GetFocusedElementForWindow(window, PR_FALSE, getter_AddRefs(focusedWindow),
getter_AddRefs(focusedElement));
// If the root element is focused, then it's actually the document
// that has the focus, so ignore this.
if (focusedElement &&
!SameCOMIdentity(focusedElement, document->GetRootContent())) {
fm->MoveCaretToFocus(window);
isFirstVisiblePreferred = PR_FALSE;
}
}
}
}