Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: ui/views/cocoa/bridged_content_view.mm

Issue 1989143002: MacViews: Correct behavior of move and select commands when selection direction changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_commands
Patch Set: Address review comments. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ui/views/cocoa/bridged_content_view.h" 5 #import "ui/views/cocoa/bridged_content_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #import "base/mac/mac_util.h" 8 #import "base/mac/mac_util.h"
9 #import "base/mac/scoped_nsobject.h" 9 #import "base/mac/scoped_nsobject.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 } 775 }
776 776
777 - (void)moveDownAndModifySelection:(id)sender { 777 - (void)moveDownAndModifySelection:(id)sender {
778 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 778 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
779 keyCode:ui::VKEY_DOWN 779 keyCode:ui::VKEY_DOWN
780 domCode:ui::DomCode::ARROW_DOWN 780 domCode:ui::DomCode::ARROW_DOWN
781 eventFlags:ui::EF_SHIFT_DOWN]; 781 eventFlags:ui::EF_SHIFT_DOWN];
782 } 782 }
783 783
784 - (void)moveToBeginningOfLineAndModifySelection:(id)sender { 784 - (void)moveToBeginningOfLineAndModifySelection:(id)sender {
785 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION 785 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_EXTEND_SELECTION
786 keyCode:ui::VKEY_HOME 786 keyCode:ui::VKEY_HOME
787 domCode:ui::DomCode::HOME 787 domCode:ui::DomCode::HOME
788 eventFlags:ui::EF_SHIFT_DOWN]; 788 eventFlags:ui::EF_SHIFT_DOWN];
789 } 789 }
790 790
791 - (void)moveToEndOfLineAndModifySelection:(id)sender { 791 - (void)moveToEndOfLineAndModifySelection:(id)sender {
792 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 792 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_EXTEND_SELECTION
793 keyCode:ui::VKEY_END 793 keyCode:ui::VKEY_END
794 domCode:ui::DomCode::END 794 domCode:ui::DomCode::END
795 eventFlags:ui::EF_SHIFT_DOWN]; 795 eventFlags:ui::EF_SHIFT_DOWN];
796 } 796 }
797 797
798 - (void)moveToBeginningOfParagraphAndModifySelection:(id)sender { 798 - (void)moveToBeginningOfParagraphAndModifySelection:(id)sender {
799 [self moveToBeginningOfLineAndModifySelection:sender]; 799 [self moveToBeginningOfLineAndModifySelection:sender];
800 } 800 }
801 801
802 - (void)moveToEndOfParagraphAndModifySelection:(id)sender { 802 - (void)moveToEndOfParagraphAndModifySelection:(id)sender {
803 [self moveToEndOfLineAndModifySelection:sender]; 803 [self moveToEndOfLineAndModifySelection:sender];
804 } 804 }
805 805
806 - (void)moveToEndOfDocumentAndModifySelection:(id)sender { 806 - (void)moveToEndOfDocumentAndModifySelection:(id)sender {
807 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 807 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_EXTEND_SELECTION
808 keyCode:ui::VKEY_END 808 keyCode:ui::VKEY_END
809 domCode:ui::DomCode::END 809 domCode:ui::DomCode::END
810 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 810 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
811 } 811 }
812 812
813 - (void)moveToBeginningOfDocumentAndModifySelection:(id)sender { 813 - (void)moveToBeginningOfDocumentAndModifySelection:(id)sender {
814 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION 814 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_EXTEND_SELECTION
815 keyCode:ui::VKEY_HOME 815 keyCode:ui::VKEY_HOME
816 domCode:ui::DomCode::HOME 816 domCode:ui::DomCode::HOME
817 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 817 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
818 } 818 }
819 819
820 - (void)pageDownAndModifySelection:(id)sender { 820 - (void)pageDownAndModifySelection:(id)sender {
821 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 821 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
822 keyCode:ui::VKEY_NEXT 822 keyCode:ui::VKEY_NEXT
823 domCode:ui::DomCode::PAGE_DOWN 823 domCode:ui::DomCode::PAGE_DOWN
824 eventFlags:ui::EF_SHIFT_DOWN]; 824 eventFlags:ui::EF_SHIFT_DOWN];
825 } 825 }
826 826
827 - (void)pageUpAndModifySelection:(id)sender { 827 - (void)pageUpAndModifySelection:(id)sender {
828 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION 828 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
829 keyCode:ui::VKEY_PRIOR 829 keyCode:ui::VKEY_PRIOR
830 domCode:ui::DomCode::PAGE_UP 830 domCode:ui::DomCode::PAGE_UP
831 eventFlags:ui::EF_SHIFT_DOWN]; 831 eventFlags:ui::EF_SHIFT_DOWN];
832 } 832 }
833 833
834 - (void)moveParagraphForwardAndModifySelection:(id)sender { 834 - (void)moveParagraphForwardAndModifySelection:(id)sender {
835 [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 835 [self handleAction:IDS_MOVE_TOWARDS_END_OF_LINE_AND_MODIFY_SELECTION
836 keyCode:ui::VKEY_DOWN 836 keyCode:ui::VKEY_DOWN
837 domCode:ui::DomCode::ARROW_DOWN 837 domCode:ui::DomCode::ARROW_DOWN
838 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 838 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
839 } 839 }
840 840
841 - (void)moveParagraphBackwardAndModifySelection:(id)sender { 841 - (void)moveParagraphBackwardAndModifySelection:(id)sender {
842 [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION 842 [self handleAction:IDS_MOVE_TOWARDS_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
843 keyCode:ui::VKEY_UP 843 keyCode:ui::VKEY_UP
844 domCode:ui::DomCode::ARROW_UP 844 domCode:ui::DomCode::ARROW_UP
845 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 845 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
846 } 846 }
847 847
848 - (void)moveWordRight:(id)sender { 848 - (void)moveWordRight:(id)sender {
849 [self handleAction:IDS_MOVE_WORD_RIGHT 849 [self handleAction:IDS_MOVE_WORD_RIGHT
850 keyCode:ui::VKEY_RIGHT 850 keyCode:ui::VKEY_RIGHT
851 domCode:ui::DomCode::ARROW_RIGHT 851 domCode:ui::DomCode::ARROW_RIGHT
852 eventFlags:ui::EF_CONTROL_DOWN]; 852 eventFlags:ui::EF_CONTROL_DOWN];
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 } 1185 }
1186 1186
1187 return [super accessibilityAttributeValue:attribute]; 1187 return [super accessibilityAttributeValue:attribute];
1188 } 1188 }
1189 1189
1190 - (id)accessibilityHitTest:(NSPoint)point { 1190 - (id)accessibilityHitTest:(NSPoint)point {
1191 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point]; 1191 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
1192 } 1192 }
1193 1193
1194 @end 1194 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698