Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-30 20:48:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore Mac-specific caret movement when there is a selection. b=299417 r=uriber sr=roc

Browse Source
This commit is contained in:
mats.palmgren%bredband.net 2005-10-17 00:51:46 +00:00
parent 0d1e336c9a
commit e36a52de0d
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
layout/generic/nsSelection.cpp
View File

@ -20,6 +20,7 @@
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* Mats Palmgren <mats.palmgren@bredband.net>
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"), * either of the GNU General Public License Version 2 or later (the "GPL"),
@ -1322,6 +1323,47 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinueSelection, nsSelection
SetDesiredX(desiredX); SetDesiredX(desiredX);
} }
PRInt32 caretStyle = nsContentUtils::GetIntPref("layout.selection.caret_style", 0);
#ifdef XP_MACOSX
if (caretStyle == 0) {
caretStyle = 2; // put caret at the selection edge in the |aKeycode| direction
}
#endif
if (!isCollapsed && !aContinueSelection && caretStyle == 2) {
switch (aKeycode){
case nsIDOMKeyEvent::DOM_VK_LEFT :
case nsIDOMKeyEvent::DOM_VK_UP :
if (mDomSelections[index]->GetDirection() == eDirPrevious) { //f,a
offsetused = mDomSelections[index]->FetchFocusOffset();
weakNodeUsed = mDomSelections[index]->FetchFocusNode();
}
else {
offsetused = mDomSelections[index]->FetchAnchorOffset();
weakNodeUsed = mDomSelections[index]->FetchAnchorNode();
}
result = mDomSelections[index]->Collapse(weakNodeUsed, offsetused);
mDomSelections[index]->ScrollIntoView();
mHint = HINTRIGHT;
return NS_OK;
case nsIDOMKeyEvent::DOM_VK_RIGHT :
case nsIDOMKeyEvent::DOM_VK_DOWN :
if (mDomSelections[index]->GetDirection() == eDirPrevious) { //f,a
offsetused = mDomSelections[index]->FetchAnchorOffset();
weakNodeUsed = mDomSelections[index]->FetchAnchorNode();
}
else {
offsetused = mDomSelections[index]->FetchFocusOffset();
weakNodeUsed = mDomSelections[index]->FetchFocusNode();
}
result = mDomSelections[index]->Collapse(weakNodeUsed, offsetused);
mDomSelections[index]->ScrollIntoView();
mHint = HINTLEFT;
return NS_OK;
}
}
nsCOMPtr<nsICaret> caret; nsCOMPtr<nsICaret> caret;
result = mShell->GetCaret(getter_AddRefs(caret)); result = mShell->GetCaret(getter_AddRefs(caret));
if (NS_FAILED(result) || !caret) if (NS_FAILED(result) || !caret)
@ -5658,7 +5700,7 @@ nsTypedSelection::Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset)
const char *tagString; const char *tagString;
content->Tag()->GetUTF8String(&tagString); content->Tag()->GetUTF8String(&tagString);
printf ("Sel. Collapse to %p %s %d\n", content, tagString, aOffset); printf ("Sel. Collapse to %p %s %d\n", content.get(), tagString, aOffset);
} }
else { else {
printf ("Sel. Collapse set to null parent.\n"); printf ("Sel. Collapse set to null parent.\n");
@ -6446,7 +6488,7 @@ nsTypedSelection::Extend(nsIDOMNode* aParentNode, PRInt32 aOffset)
const char *tagString; const char *tagString;
content->Tag()->GetUTF8String(&tagString); content->Tag()->GetUTF8String(&tagString);
printf ("Sel. Extend to %p %s %d\n", content, tagString, aOffset); printf ("Sel. Extend to %p %s %d\n", content.get(), tagString, aOffset);
} }
else { else {
printf ("Sel. Extend set to null parent.\n"); printf ("Sel. Extend set to null parent.\n");

6
modules/libpref/src/init/all.js
View File

@ -928,6 +928,12 @@ pref("bidi.characterset", 1);
pref("layout.word_select.eat_space_to_next_word", false); pref("layout.word_select.eat_space_to_next_word", false);
pref("layout.word_select.stop_at_punctuation", true); pref("layout.word_select.stop_at_punctuation", true);
// controls caret style during text selection
// 0 = use platform default
// 1 = caret moves and blinks as when there is no selection
// 2 = caret moves to selection edge and is not visible during selection
pref("layout.selection.caret_style", 0);
// pref to control whether or not to replace backslashes with Yen signs // pref to control whether or not to replace backslashes with Yen signs
// in documents encoded in one of Japanese legacy encodings (EUC-JP, // in documents encoded in one of Japanese legacy encodings (EUC-JP,
// Shift_JIS, ISO-2022-JP) // Shift_JIS, ISO-2022-JP)