Chromium Code Reviews| Index: ui/views/cocoa/bridged_content_view.mm |
| diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm |
| index 6b53860e202bfe7ff39ef2d021a92653b57c4382..68284dc3912b0395189aec3490b621185228f11d 100644 |
| --- a/ui/views/cocoa/bridged_content_view.mm |
| +++ b/ui/views/cocoa/bridged_content_view.mm |
| @@ -649,6 +649,11 @@ base::string16 AttributedSubstringForRangeHelper( |
| // Selection movement and scrolling. |
| +- (void)moveForward:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveLeft:sender] |
|
karandeepb
2016/05/16 00:11:08
I think that I should add a GetTextDirection() pub
|
| + : [self moveRight:sender]; |
| +} |
| + |
| - (void)moveRight:(id)sender { |
| [self handleAction:IDS_MOVE_RIGHT |
| keyCode:ui::VKEY_RIGHT |
| @@ -656,6 +661,11 @@ base::string16 AttributedSubstringForRangeHelper( |
| eventFlags:0]; |
| } |
| +- (void)moveBackward:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveRight:sender] |
| + : [self moveLeft:sender]; |
| +} |
| + |
| - (void)moveLeft:(id)sender { |
| [self handleAction:IDS_MOVE_LEFT |
| keyCode:ui::VKEY_LEFT |
| @@ -663,20 +673,151 @@ base::string16 AttributedSubstringForRangeHelper( |
| eventFlags:0]; |
| } |
| +// Todo ask if should use IDS_MOVE_UP. |
| - (void)moveUp:(id)sender { |
|
karandeepb
2016/05/16 00:11:08
Should I use the command IDS_MOVE_UP and only enab
|
| - [self handleAction:0 |
| + [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE |
| keyCode:ui::VKEY_UP |
| domCode:ui::DomCode::ARROW_UP |
| eventFlags:0]; |
| } |
| - (void)moveDown:(id)sender { |
| - [self handleAction:0 |
| + [self handleAction:IDS_MOVE_TO_END_OF_LINE |
| keyCode:ui::VKEY_DOWN |
| domCode:ui::DomCode::ARROW_DOWN |
| eventFlags:0]; |
| } |
| +- (void)moveWordForward:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveWordLeft:sender] |
| + : [self moveWordRight:sender]; |
| +} |
| + |
| +- (void)moveWordBackward:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveWordRight:sender] |
| + : [self moveWordLeft:sender]; |
| +} |
| + |
| +- (void)moveToBeginningOfLine:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE |
| + keyCode:ui::VKEY_HOME |
| + domCode:ui::DomCode::HOME |
| + eventFlags:0]; |
| +} |
| + |
| +- (void)moveToEndOfLine:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_TO_END_OF_LINE |
| + keyCode:ui::VKEY_END |
| + domCode:ui::DomCode::END |
| + eventFlags:0]; |
| +} |
| + |
| +- (void)moveToBeginningOfParagraph:(nullable id)sender { |
| + [self moveToBeginningOfLine:sender]; |
| +} |
| + |
| +- (void)moveToEndOfParagraph:(nullable id)sender { |
| + [self moveToEndOfLine:sender]; |
| +} |
| + |
| +- (void)moveToEndOfDocument:(nullable id)sender { |
| + [self moveToEndOfLine:sender]; |
| +} |
| + |
| +- (void)moveToBeginningOfDocument:(nullable id)sender { |
| + [self moveToBeginningOfLine:sender]; |
| +} |
| + |
| +- (void)pageDown:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_TO_END_OF_LINE |
| + keyCode:ui::VKEY_NEXT |
| + domCode:ui::DomCode::PAGE_DOWN |
| + eventFlags:0]; |
| +} |
| + |
| +- (void)pageUp:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE |
| + keyCode:ui::VKEY_PRIOR |
| + domCode:ui::DomCode::PAGE_UP |
| + eventFlags:0]; |
| +} |
| + |
| +- (void)moveBackwardAndModifySelection:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveRightAndModifySelection:sender] |
| + : [self moveLeftAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveForwardAndModifySelection:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveLeftAndModifySelection:sender] |
| + : [self moveRightAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveWordForwardAndModifySelection:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveWordLeftAndModifySelection:sender] |
| + : [self moveWordRightAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveWordBackwardAndModifySelection:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveWordRightAndModifySelection:sender] |
| + : [self moveWordLeftAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveUpAndModifySelection:(nullable id)sender { |
| + [self moveToBeginningOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveDownAndModifySelection:(nullable id)sender { |
| + [self moveToEndOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveToBeginningOfLineAndModifySelection:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION |
| + keyCode:ui::VKEY_HOME |
| + domCode:ui::DomCode::HOME |
| + eventFlags:ui::EF_SHIFT_DOWN]; |
| +} |
| + |
| +- (void)moveToEndOfLineAndModifySelection:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION |
| + keyCode:ui::VKEY_END |
| + domCode:ui::DomCode::END |
| + eventFlags:ui::EF_SHIFT_DOWN]; |
| +} |
| + |
| +- (void)moveToBeginningOfParagraphAndModifySelection:(nullable id)sender { |
| + [self moveToBeginningOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveToEndOfParagraphAndModifySelection:(nullable id)sender { |
| + [self moveToEndOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveToEndOfDocumentAndModifySelection:(nullable id)sender { |
| + [self moveToEndOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveToBeginningOfDocumentAndModifySelection:(nullable id)sender { |
| + [self moveToBeginningOfLineAndModifySelection:sender]; |
| +} |
| + |
| +// Not sure if keycodes are to be added, can use |
| +// https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/editing/EditingBehavior.cpp |
| +- (void)pageDownAndModifySelection:(nullable id)sender { |
| + [self moveToEndOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)pageUpAndModifySelection:(nullable id)sender { |
| + [self moveToBeginningOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveParagraphForwardAndModifySelection:(nullable id)sender { |
| + [self moveToEndOfLineAndModifySelection:sender]; |
| +} |
| + |
| +- (void)moveParagraphBackwardAndModifySelection:(nullable id)sender { |
| + [self moveToBeginningOfLineAndModifySelection:sender]; |
| +} |
| + |
| - (void)moveWordRight:(id)sender { |
| [self handleAction:IDS_MOVE_WORD_RIGHT |
| keyCode:ui::VKEY_RIGHT |
| @@ -684,67 +825,61 @@ base::string16 AttributedSubstringForRangeHelper( |
| eventFlags:ui::EF_CONTROL_DOWN]; |
| } |
| -- (void)moveWordLeft:(id)sender { |
| +- (void)moveWordLeft:(nullable id)sender { |
| [self handleAction:IDS_MOVE_WORD_LEFT |
| keyCode:ui::VKEY_LEFT |
| domCode:ui::DomCode::ARROW_LEFT |
| eventFlags:ui::EF_CONTROL_DOWN]; |
| } |
| -- (void)moveLeftAndModifySelection:(id)sender { |
| - [self handleAction:IDS_MOVE_LEFT_AND_MODIFY_SELECTION |
| - keyCode:ui::VKEY_LEFT |
| - domCode:ui::DomCode::ARROW_LEFT |
| - eventFlags:ui::EF_SHIFT_DOWN]; |
| -} |
| - |
| -- (void)moveRightAndModifySelection:(id)sender { |
| +- (void)moveRightAndModifySelection:(nullable id)sender { |
| [self handleAction:IDS_MOVE_RIGHT_AND_MODIFY_SELECTION |
| keyCode:ui::VKEY_RIGHT |
| domCode:ui::DomCode::ARROW_RIGHT |
| eventFlags:ui::EF_SHIFT_DOWN]; |
| } |
| -- (void)moveWordRightAndModifySelection:(id)sender { |
| +- (void)moveLeftAndModifySelection:(nullable id)sender { |
| + [self handleAction:IDS_MOVE_LEFT_AND_MODIFY_SELECTION |
| + keyCode:ui::VKEY_LEFT |
| + domCode:ui::DomCode::ARROW_LEFT |
| + eventFlags:ui::EF_SHIFT_DOWN]; |
| +} |
| + |
| +- (void)moveWordRightAndModifySelection:(nullable id)sender { |
| [self handleAction:IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION |
| keyCode:ui::VKEY_RIGHT |
| domCode:ui::DomCode::ARROW_RIGHT |
| eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; |
| } |
| -- (void)moveWordLeftAndModifySelection:(id)sender { |
| +- (void)moveWordLeftAndModifySelection:(nullable id)sender { |
| [self handleAction:IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION |
| keyCode:ui::VKEY_LEFT |
| domCode:ui::DomCode::ARROW_LEFT |
| eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; |
| } |
| -- (void)moveToLeftEndOfLine:(id)sender { |
| - [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE |
| - keyCode:ui::VKEY_HOME |
| - domCode:ui::DomCode::HOME |
| - eventFlags:0]; |
| +- (void)moveToLeftEndOfLine:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveToEndOfLine:sender] |
| + : [self moveToBeginningOfLine:sender]; |
| } |
| -- (void)moveToRightEndOfLine:(id)sender { |
| - [self handleAction:IDS_MOVE_TO_END_OF_LINE |
| - keyCode:ui::VKEY_END |
| - domCode:ui::DomCode::END |
| - eventFlags:0]; |
| +- (void)moveToRightEndOfLine:(nullable id)sender { |
| + IsTextRTL(textInputClient_) ? [self moveToBeginningOfLine:sender] |
| + : [self moveToEndOfLine:sender]; |
| } |
| -- (void)moveToLeftEndOfLineAndModifySelection:(id)sender { |
| - [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION |
| - keyCode:ui::VKEY_HOME |
| - domCode:ui::DomCode::HOME |
| - eventFlags:ui::EF_SHIFT_DOWN]; |
| +- (void)moveToLeftEndOfLineAndModifySelection:(nullable id)sender { |
| + IsTextRTL(textInputClient_) |
| + ? [self moveToEndOfLineAndModifySelection:sender] |
| + : [self moveToBeginningOfLineAndModifySelection:sender]; |
| } |
| -- (void)moveToRightEndOfLineAndModifySelection:(id)sender { |
| - [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION |
| - keyCode:ui::VKEY_END |
| - domCode:ui::DomCode::END |
| - eventFlags:ui::EF_SHIFT_DOWN]; |
| +- (void)moveToRightEndOfLineAndModifySelection:(nullable id)sender { |
| + IsTextRTL(textInputClient_) |
| + ? [self moveToBeginningOfLineAndModifySelection:sender] |
| + : [self moveToEndOfLineAndModifySelection:sender]; |
| } |
| // Deletions. |