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

TextView: Remove Cmd+Up and Cmd+Down Shortcuts

Browse Source 
to go to the beginning and end of the document.
This commit is contained in:
John Scipione
2014-02-01 11:04:34 -05:00
parent 94518ff277
commit 77acb43273
2 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/TextView.h
-2
View File
@@ -456,13 +456,11 @@ private:
bool fInstalledNavigateCommandWordwiseShortcuts; bool fInstalledNavigateCommandWordwiseShortcuts;
bool fInstalledNavigateOptionWordwiseShortcuts; bool fInstalledNavigateOptionWordwiseShortcuts;
bool fInstalledNavigateOptionLinewiseShortcuts; bool fInstalledNavigateOptionLinewiseShortcuts;
bool fInstalledNavigateCommandDocwiseShortcuts;
bool fInstalledNavigateHomeEndDocwiseShortcuts; bool fInstalledNavigateHomeEndDocwiseShortcuts;
bool fInstalledSelectCommandWordwiseShortcuts; bool fInstalledSelectCommandWordwiseShortcuts;
bool fInstalledSelectOptionWordwiseShortcuts; bool fInstalledSelectOptionWordwiseShortcuts;
bool fInstalledSelectOptionLinewiseShortcuts; bool fInstalledSelectOptionLinewiseShortcuts;
bool fInstalledSelectCommandDocwiseShortcuts;
bool fInstalledSelectHomeEndDocwiseShortcuts; bool fInstalledSelectHomeEndDocwiseShortcuts;
uint32 _reserved[6]; uint32 _reserved[6];
src/kits/interface/TextView.cpp
-46
View File
@@ -3111,13 +3111,11 @@ BTextView::_InitObject(BRect textRect, const BFont* initialFont,
fInstalledNavigateCommandWordwiseShortcuts = false; fInstalledNavigateCommandWordwiseShortcuts = false;
fInstalledNavigateOptionWordwiseShortcuts = false; fInstalledNavigateOptionWordwiseShortcuts = false;
fInstalledNavigateOptionLinewiseShortcuts = false; fInstalledNavigateOptionLinewiseShortcuts = false;
fInstalledNavigateCommandDocwiseShortcuts = false;
fInstalledNavigateHomeEndDocwiseShortcuts = false; fInstalledNavigateHomeEndDocwiseShortcuts = false;
fInstalledSelectCommandWordwiseShortcuts = false; fInstalledSelectCommandWordwiseShortcuts = false;
fInstalledSelectOptionWordwiseShortcuts = false; fInstalledSelectOptionWordwiseShortcuts = false;
fInstalledSelectOptionLinewiseShortcuts = false; fInstalledSelectOptionLinewiseShortcuts = false;
fInstalledSelectCommandDocwiseShortcuts = false;
fInstalledSelectHomeEndDocwiseShortcuts = false; fInstalledSelectHomeEndDocwiseShortcuts = false;
// We put these here instead of in the constructor initializer list // We put these here instead of in the constructor initializer list
@@ -5082,38 +5080,6 @@ BTextView::_Activate()
fInstalledSelectOptionLinewiseShortcuts = true; fInstalledSelectOptionLinewiseShortcuts = true;
} }
if (!Window()->HasShortcut(B_UP_ARROW, B_COMMAND_KEY)
&& !Window()->HasShortcut(B_DOWN_ARROW, B_COMMAND_KEY)) {
message = new BMessage(kMsgNavigateArrow);
message->AddInt32("key", B_UP_ARROW);
message->AddInt32("modifiers", B_COMMAND_KEY);
Window()->AddShortcut(B_UP_ARROW, B_COMMAND_KEY, message, this);
message = new BMessage(kMsgNavigateArrow);
message->AddInt32("key", B_DOWN_ARROW);
message->AddInt32("modifiers", B_COMMAND_KEY);
Window()->AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY, message, this);
fInstalledNavigateCommandDocwiseShortcuts = true;
}
if (!Window()->HasShortcut(B_UP_ARROW, B_COMMAND_KEY | B_SHIFT_KEY)
&& !Window()->HasShortcut(B_DOWN_ARROW,
B_COMMAND_KEY | B_SHIFT_KEY)) {
message = new BMessage(kMsgNavigateArrow);
message->AddInt32("key", B_UP_ARROW);
message->AddInt32("modifiers", B_COMMAND_KEY | B_SHIFT_KEY);
Window()->AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_SHIFT_KEY,
message, this);
message = new BMessage(kMsgNavigateArrow);
message->AddInt32("key", B_DOWN_ARROW);
message->AddInt32("modifiers", B_COMMAND_KEY | B_SHIFT_KEY);
Window()->AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_SHIFT_KEY,
message, this);
fInstalledSelectCommandDocwiseShortcuts = 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)) {
message = new BMessage(kMsgNavigatePage); message = new BMessage(kMsgNavigatePage);
@@ -5198,18 +5164,6 @@ BTextView::_Deactivate()
fInstalledSelectOptionLinewiseShortcuts = false; fInstalledSelectOptionLinewiseShortcuts = false;
} }
if (fInstalledNavigateCommandDocwiseShortcuts) {
Window()->RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY);
Window()->RemoveShortcut(B_DOWN_ARROW, B_COMMAND_KEY);
fInstalledNavigateCommandDocwiseShortcuts = false;
}
if (fInstalledSelectCommandDocwiseShortcuts) {
Window()->RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_SHIFT_KEY);
Window()->RemoveShortcut(B_DOWN_ARROW,
B_COMMAND_KEY | B_SHIFT_KEY);
fInstalledSelectCommandDocwiseShortcuts = false;
}
if (fInstalledNavigateHomeEndDocwiseShortcuts) { if (fInstalledNavigateHomeEndDocwiseShortcuts) {
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);