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

use proper key for discontiguous selection on Mac (r=jfrancis)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@57680 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com
2000-01-13 16:07:03 +00:00
parent c4d1ab0638
commit ff04156de5
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/layout/generic/nsFrame.cpp
View File

@@ -839,7 +839,6 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
nsCOMPtr<nsIPresShell> shell;
nsresult rv = aPresContext->GetShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell) {
nsInputEvent *inputEvent = (nsInputEvent *)aEvent;
PRInt32 startPos = 0;
// PRUint32 contentOffset = 0;
PRInt32 contentOffsetEnd = 0;
@@ -851,7 +850,13 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
nsCOMPtr<nsIFrameSelection> frameselection;
if (NS_SUCCEEDED(shell->GetFrameSelection(getter_AddRefs(frameselection))) && frameselection){
frameselection->SetMouseDownState(PR_TRUE);//not important if it fails here
frameselection->HandleClick(newContent, startPos , contentOffsetEnd , inputEvent->isShift, inputEvent->isControl,beginContent);
PRBool doMultipleSelection;
#ifdef XP_MAC
doMultipleSelection = me->isMeta;
#else
doMultipleSelection = me->isControl;
#endif
frameselection->HandleClick(newContent, startPos , contentOffsetEnd , me->isShift, doMultipleSelection, beginContent);
}
//no release
}

9
mozilla/layout/html/base/src/nsFrame.cpp
View File

@@ -839,7 +839,6 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
nsCOMPtr<nsIPresShell> shell;
nsresult rv = aPresContext->GetShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell) {
nsInputEvent *inputEvent = (nsInputEvent *)aEvent;
PRInt32 startPos = 0;
// PRUint32 contentOffset = 0;
PRInt32 contentOffsetEnd = 0;
@@ -851,7 +850,13 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
nsCOMPtr<nsIFrameSelection> frameselection;
if (NS_SUCCEEDED(shell->GetFrameSelection(getter_AddRefs(frameselection))) && frameselection){
frameselection->SetMouseDownState(PR_TRUE);//not important if it fails here
frameselection->HandleClick(newContent, startPos , contentOffsetEnd , inputEvent->isShift, inputEvent->isControl,beginContent);
PRBool doMultipleSelection;
#ifdef XP_MAC
doMultipleSelection = me->isMeta;
#else
doMultipleSelection = me->isControl;
#endif
frameselection->HandleClick(newContent, startPos , contentOffsetEnd , me->isShift, doMultipleSelection, beginContent);
}
//no release
}