i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TextView:Cmd/Ctrl-Home/End Shift-selection support

Browse Source 
Fixes #6859

Signed-off-by: Siarzhuk Zharski <[email protected]>
This commit is contained in:
Przemysław Buczkowski
2013-01-14 21:10:21 +01:00
committed by Siarzhuk Zharski
parent 075d3e60f4
commit dc871e324d
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/TextView.h
+2
View File
@@ -455,6 +455,8 @@ private:
int32 fLastClickOffset; int32 fLastClickOffset;
bool fInstalledNavigateWordwiseShortcuts; bool fInstalledNavigateWordwiseShortcuts;
bool fInstalledNavigateToTopOrBottomShortcuts; bool fInstalledNavigateToTopOrBottomShortcuts;
bool fInstalledSelectWordwiseShortcuts;
bool fInstalledSelectToTopOrBottomShortcuts;
uint32 _reserved[6]; uint32 _reserved[6];
}; };
src/kits/interface/TextView.cpp
+39 -2
View File
@@ -3343,6 +3343,8 @@ BTextView::_InitObject(BRect textRect, const BFont *initialFont,
fInstalledNavigateWordwiseShortcuts = false; fInstalledNavigateWordwiseShortcuts = false;
fInstalledNavigateToTopOrBottomShortcuts = false; fInstalledNavigateToTopOrBottomShortcuts = false;
fInstalledSelectWordwiseShortcuts = false;
fInstalledSelectToTopOrBottomShortcuts = false;
// We put these here instead of in the constructor initializer list // We put these here instead of in the constructor initializer list
// to have less code duplication, and a single place where to do changes // to have less code duplication, and a single place where to do changes
@@ -3619,6 +3621,7 @@ BTextView::_HandlePageKey(uint32 inPageKey, bool commandKeyDown)
currentMessage->FindInt32("modifiers", &mods); currentMessage->FindInt32("modifiers", &mods);
bool shiftDown = mods & B_SHIFT_KEY; bool shiftDown = mods & B_SHIFT_KEY;
bool controlDown = mods & B_CONTROL_KEY;
STELine* line = NULL; STELine* line = NULL;
int32 selStart = fSelStart; int32 selStart = fSelStart;
int32 selEnd = fSelEnd; int32 selEnd = fSelEnd;
@@ -3631,7 +3634,7 @@ BTextView::_HandlePageKey(uint32 inPageKey, bool commandKeyDown)
break; break;
} }
if (commandKeyDown) { if (commandKeyDown || controlDown) {
_ScrollTo(0, 0); _ScrollTo(0, 0);
fCaretOffset = 0; fCaretOffset = 0;
} else { } else {
@@ -3664,7 +3667,7 @@ BTextView::_HandlePageKey(uint32 inPageKey, bool commandKeyDown)
break; break;
} }
if (commandKeyDown) { if (commandKeyDown || controlDown) {
_ScrollTo(0, fTextRect.bottom + fLayoutData->bottomInset); _ScrollTo(0, fTextRect.bottom + fLayoutData->bottomInset);
fCaretOffset = fText->Length(); fCaretOffset = fText->Length();
} else { } else {
@@ -5178,6 +5181,18 @@ BTextView::_Activate()
new BMessage(NAVIGATE_TO_NEXT_WORD), this); new BMessage(NAVIGATE_TO_NEXT_WORD), this);
fInstalledNavigateWordwiseShortcuts = true; fInstalledNavigateWordwiseShortcuts = true;
} }
if (!Window()->HasShortcut(B_LEFT_ARROW, B_COMMAND_KEY | B_SHIFT_KEY)
&& !Window()->HasShortcut(B_RIGHT_ARROW, B_COMMAND_KEY | B_SHIFT_KEY)) {
BMessage* message = new BMessage(NAVIGATE_TO_PREVIOUS_WORD);
message->AddInt32("modifiers", B_SHIFT_KEY);
Window()->AddShortcut(B_LEFT_ARROW, B_COMMAND_KEY | B_SHIFT_KEY,
message, this);
message = new BMessage(NAVIGATE_TO_NEXT_WORD);
message->AddInt32("modifiers", B_SHIFT_KEY);
Window()->AddShortcut(B_RIGHT_ARROW, B_COMMAND_KEY | B_SHIFT_KEY,
message, this);
fInstalledSelectWordwiseShortcuts = true;
}
if (!Window()->HasShortcut(B_HOME, B_COMMAND_KEY) if (!Window()->HasShortcut(B_HOME, B_COMMAND_KEY)
&& !Window()->HasShortcut(B_END, B_COMMAND_KEY)) { && !Window()->HasShortcut(B_END, B_COMMAND_KEY)) {
Window()->AddShortcut(B_HOME, B_COMMAND_KEY, Window()->AddShortcut(B_HOME, B_COMMAND_KEY,
@@ -5186,6 +5201,18 @@ BTextView::_Activate()
new BMessage(NAVIGATE_TO_BOTTOM), this); new BMessage(NAVIGATE_TO_BOTTOM), this);
fInstalledNavigateToTopOrBottomShortcuts = true; fInstalledNavigateToTopOrBottomShortcuts = true;
} }
if (!Window()->HasShortcut(B_HOME, B_COMMAND_KEY | B_SHIFT_KEY)
&& !Window()->HasShortcut(B_END, B_COMMAND_KEY | B_SHIFT_KEY)) {
BMessage* message = new BMessage(NAVIGATE_TO_TOP);
message->AddInt32("modifiers", B_SHIFT_KEY);
Window()->AddShortcut(B_HOME, B_COMMAND_KEY | B_SHIFT_KEY,
message, this);
message = new BMessage(NAVIGATE_TO_BOTTOM);
message->AddInt32("modifiers", B_SHIFT_KEY);
Window()->AddShortcut(B_END, B_COMMAND_KEY | B_SHIFT_KEY,
message, this);
fInstalledSelectToTopOrBottomShortcuts = true;
}
} }
} }
@@ -5212,11 +5239,21 @@ BTextView::_Deactivate()
Window()->RemoveShortcut(B_RIGHT_ARROW, B_COMMAND_KEY); Window()->RemoveShortcut(B_RIGHT_ARROW, B_COMMAND_KEY);
fInstalledNavigateWordwiseShortcuts = false; fInstalledNavigateWordwiseShortcuts = false;
} }
if (fInstalledSelectWordwiseShortcuts) {
Window()->RemoveShortcut(B_LEFT_ARROW, B_COMMAND_KEY | B_SHIFT_KEY);
Window()->RemoveShortcut(B_RIGHT_ARROW, B_COMMAND_KEY | B_SHIFT_KEY);
fInstalledSelectWordwiseShortcuts = false;
}
if (fInstalledNavigateToTopOrBottomShortcuts) { if (fInstalledNavigateToTopOrBottomShortcuts) {
Window()->RemoveShortcut(B_HOME, B_COMMAND_KEY); Window()->RemoveShortcut(B_HOME, B_COMMAND_KEY);
Window()->RemoveShortcut(B_END, B_COMMAND_KEY); Window()->RemoveShortcut(B_END, B_COMMAND_KEY);
fInstalledNavigateToTopOrBottomShortcuts = false; fInstalledNavigateToTopOrBottomShortcuts = false;
} }
if (fInstalledSelectToTopOrBottomShortcuts) {
Window()->RemoveShortcut(B_HOME, B_COMMAND_KEY | B_SHIFT_KEY);
Window()->RemoveShortcut(B_END, B_COMMAND_KEY | B_SHIFT_KEY);
fInstalledSelectToTopOrBottomShortcuts = false;
}
} }
} }