зеркало из https://github.com/mozilla/pjs.git
adding parameter to nsIFrame for ::PeekOffset to be aware of the state of jumping a word. eating WS ect. also, nsRangeList sends the proper parameter for above change.
This commit is contained in:
Родитель
d4fd3a2158
Коммит
7d4b7bff9f
|
@ -590,9 +590,10 @@ public:
|
|||
* @param aResultFrame frame that actually is the next/previous
|
||||
* @param aFrameOffset offset from frame of the frame results
|
||||
* @param aContentOffset offset from content of the frame results
|
||||
* @param aEatingWS boolean to tell us the state of our search for Next/Prev
|
||||
*/
|
||||
NS_IMETHOD PeekOffset(nsSelectionAmount aAmount, nsDirection aDirection, PRInt32 aStartOffset,
|
||||
nsIFrame **aResultFrame, PRInt32 *aFrameOffset, PRInt32 *aContentOffset) = 0;
|
||||
nsIFrame **aResultFrame, PRInt32 *aFrameOffset, PRInt32 *aContentOffset, PRBool aEatingWS) = 0;
|
||||
|
||||
/**
|
||||
* See if tree verification is enabled. To enable tree verification add
|
||||
|
|
|
@ -583,7 +583,7 @@ nsRangeList::HandleKeyEvent(nsIFocusTracker *aTracker, nsGUIEvent *aGuiEvent)
|
|||
offsetused = beginoffset;
|
||||
frameused = anchor;
|
||||
}
|
||||
if (NS_SUCCEEDED(frameused->PeekOffset(amount, eDirPrevious, offsetused, &resultFrame, &frameOffset, &contentOffset)) && resultFrame){
|
||||
if (NS_SUCCEEDED(frameused->PeekOffset(amount, eDirPrevious, offsetused, &resultFrame, &frameOffset, &contentOffset, PR_FALSE)) && resultFrame){
|
||||
result = TakeFocus(aTracker, resultFrame, frameOffset, contentOffset, keyEvent->isShift);
|
||||
}
|
||||
break;
|
||||
|
@ -602,7 +602,7 @@ nsRangeList::HandleKeyEvent(nsIFocusTracker *aTracker, nsGUIEvent *aGuiEvent)
|
|||
offsetused = endoffset;
|
||||
frameused = frame;
|
||||
}
|
||||
if (NS_SUCCEEDED(frameused->PeekOffset(amount, eDirNext, offsetused, &resultFrame, &frameOffset, &contentOffset)) && resultFrame){
|
||||
if (NS_SUCCEEDED(frameused->PeekOffset(amount, eDirNext, offsetused, &resultFrame, &frameOffset, &contentOffset, PR_FALSE)) && resultFrame){
|
||||
result = TakeFocus(aTracker, resultFrame, frameOffset, contentOffset, keyEvent->isShift);
|
||||
}
|
||||
case nsIDOMEvent::VK_UP :
|
||||
|
|
|
@ -590,9 +590,10 @@ public:
|
|||
* @param aResultFrame frame that actually is the next/previous
|
||||
* @param aFrameOffset offset from frame of the frame results
|
||||
* @param aContentOffset offset from content of the frame results
|
||||
* @param aEatingWS boolean to tell us the state of our search for Next/Prev
|
||||
*/
|
||||
NS_IMETHOD PeekOffset(nsSelectionAmount aAmount, nsDirection aDirection, PRInt32 aStartOffset,
|
||||
nsIFrame **aResultFrame, PRInt32 *aFrameOffset, PRInt32 *aContentOffset) = 0;
|
||||
nsIFrame **aResultFrame, PRInt32 *aFrameOffset, PRInt32 *aContentOffset, PRBool aEatingWS) = 0;
|
||||
|
||||
/**
|
||||
* See if tree verification is enabled. To enable tree verification add
|
||||
|
|
Загрузка…
Ссылка в новой задаче