Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 310241. Selection forgotten when you click on a button. r=mats, sr=jst

Browse Source
This commit is contained in:
aaronleventhal%moonset.net 2005-10-11 03:33:48 +00:00
parent 481d809747
commit b3c1a7bb46
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/events/src/nsEventStateManager.cpp
View File

@ -214,6 +214,7 @@ nsEventStateManager::nsEventStateManager()
mGestureDownPoint(0,0),
mCurrentFocusFrame(nsnull),
mCurrentTabIndex(0),
mLastFocusedWith(eEventFocusedByUnknown),
mPresContext(nsnull),
mLClickCount(0),
mMClickCount(0),
@ -3051,6 +3052,7 @@ NS_IMETHODIMP
nsEventStateManager::ChangeFocusWith(nsIContent* aFocusContent,
EFocusedWithType aFocusedWith)
{
mLastFocusedWith = aFocusedWith;
if (!aFocusContent) {
SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
return NS_OK;
@ -3094,24 +3096,6 @@ nsEventStateManager::ChangeFocusWith(nsIContent* aFocusContent,
}
}
}
else {
nsCOMPtr<nsISelectionController> selCon(do_QueryInterface(mPresContext->PresShell()));
nsCOMPtr<nsISelection> selection;
if (selCon) {
selCon->GetSelection(nsISelectionController::SELECTION_NORMAL,
getter_AddRefs(selection));
nsCOMPtr<nsIDOMNode> focusNode(do_QueryInterface(aFocusContent));
NS_ASSERTION(focusNode, "No focus node for non-docroot content");
// Move caret to focus only if focus not already contained in selection
PRBool isFocusInSelection = PR_FALSE;
if (selection) {
selection->ContainsNode(focusNode, PR_TRUE, &isFocusInSelection);
}
if (!isFocusInSelection) {
MoveCaretToFocus();
}
}
}
// Unlock scroll
if (suppressFocusScroll)
@ -3234,8 +3218,7 @@ nsEventStateManager::ShiftFocusInternal(PRBool aForward, nsIContent* aStart)
// point was given.
if (!aStart && itemType != nsIDocShellTreeItem::typeChrome) {
// We're going to tab from the selection position
nsCOMPtr<nsIDOMHTMLAreaElement> areaElement(do_QueryInterface(mCurrentFocus));
if (!areaElement) {
if (!mCurrentFocus || (mLastFocusedWith != eEventFocusedByMouse && mCurrentFocus->Tag() != nsHTMLAtoms::area)) {
nsCOMPtr<nsIContent> selectionContent, endSelectionContent; // We won't be using this, need arg for method call
PRUint32 selectionOffset; // We won't be using this either, need arg for method call
GetDocSelectionLocation(getter_AddRefs(selectionContent), getter_AddRefs(endSelectionContent), &selectionFrame, &selectionOffset);

1
content/events/src/nsEventStateManager.h
View File

@ -325,6 +325,7 @@ protected:
nsCOMPtr<nsIContent> mLastFocus;
nsIFrame* mCurrentFocusFrame;
PRInt32 mCurrentTabIndex;
EFocusedWithType mLastFocusedWith;
// DocShell Traversal Data Memebers
nsCOMPtr<nsIContent> mLastContentFocus;