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

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

Issue 2228833002: MacViews: Fix behavior of move and select commands when selection direction changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_text_commands
Patch Set: Fix compile. Created 4 years, 4 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 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 } 784 }
785 785
786 - (void)moveLeft:(id)sender { 786 - (void)moveLeft:(id)sender {
787 [self handleAction:ui::TextEditCommand::MOVE_LEFT 787 [self handleAction:ui::TextEditCommand::MOVE_LEFT
788 keyCode:ui::VKEY_LEFT 788 keyCode:ui::VKEY_LEFT
789 domCode:ui::DomCode::ARROW_LEFT 789 domCode:ui::DomCode::ARROW_LEFT
790 eventFlags:0]; 790 eventFlags:0];
791 } 791 }
792 792
793 - (void)moveUp:(id)sender { 793 - (void)moveUp:(id)sender {
794 [self handleAction:ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE 794 [self handleAction:ui::TextEditCommand::MOVE_UP
795 keyCode:ui::VKEY_UP 795 keyCode:ui::VKEY_UP
796 domCode:ui::DomCode::ARROW_UP 796 domCode:ui::DomCode::ARROW_UP
797 eventFlags:0]; 797 eventFlags:0];
798 } 798 }
799 799
800 - (void)moveDown:(id)sender { 800 - (void)moveDown:(id)sender {
801 [self handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE 801 [self handleAction:ui::TextEditCommand::MOVE_DOWN
802 keyCode:ui::VKEY_DOWN 802 keyCode:ui::VKEY_DOWN
803 domCode:ui::DomCode::ARROW_DOWN 803 domCode:ui::DomCode::ARROW_DOWN
804 eventFlags:0]; 804 eventFlags:0];
805 } 805 }
806 806
807 - (void)moveWordForward:(id)sender { 807 - (void)moveWordForward:(id)sender {
808 [self handleAction:ui::TextEditCommand::MOVE_WORD_FORWARD 808 [self handleAction:ui::TextEditCommand::MOVE_WORD_FORWARD
809 keyCode:ui::VKEY_UNKNOWN 809 keyCode:ui::VKEY_UNKNOWN
810 domCode:ui::DomCode::NONE 810 domCode:ui::DomCode::NONE
811 eventFlags:0]; 811 eventFlags:0];
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 } 854 }
855 855
856 - (void)moveToBeginningOfDocument:(id)sender { 856 - (void)moveToBeginningOfDocument:(id)sender {
857 [self handleAction:ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT 857 [self handleAction:ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT
858 keyCode:ui::VKEY_HOME 858 keyCode:ui::VKEY_HOME
859 domCode:ui::DomCode::HOME 859 domCode:ui::DomCode::HOME
860 eventFlags:ui::EF_CONTROL_DOWN]; 860 eventFlags:ui::EF_CONTROL_DOWN];
861 } 861 }
862 862
863 - (void)pageDown:(id)sender { 863 - (void)pageDown:(id)sender {
864 [self handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE 864 [self handleAction:ui::TextEditCommand::MOVE_PAGE_DOWN
865 keyCode:ui::VKEY_NEXT 865 keyCode:ui::VKEY_NEXT
866 domCode:ui::DomCode::PAGE_DOWN 866 domCode:ui::DomCode::PAGE_DOWN
867 eventFlags:0]; 867 eventFlags:0];
868 } 868 }
869 869
870 - (void)pageUp:(id)sender { 870 - (void)pageUp:(id)sender {
871 [self handleAction:ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE 871 [self handleAction:ui::TextEditCommand::MOVE_PAGE_UP
872 keyCode:ui::VKEY_PRIOR 872 keyCode:ui::VKEY_PRIOR
873 domCode:ui::DomCode::PAGE_UP 873 domCode:ui::DomCode::PAGE_UP
874 eventFlags:0]; 874 eventFlags:0];
875 } 875 }
876 876
877 - (void)moveBackwardAndModifySelection:(id)sender { 877 - (void)moveBackwardAndModifySelection:(id)sender {
878 [self handleAction:ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION 878 [self handleAction:ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION
879 keyCode:ui::VKEY_UNKNOWN 879 keyCode:ui::VKEY_UNKNOWN
880 domCode:ui::DomCode::NONE 880 domCode:ui::DomCode::NONE
881 eventFlags:0]; 881 eventFlags:0];
(...skipping 15 matching lines...) Expand all
897 897
898 - (void)moveWordBackwardAndModifySelection:(id)sender { 898 - (void)moveWordBackwardAndModifySelection:(id)sender {
899 [self 899 [self
900 handleAction:ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION 900 handleAction:ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION
901 keyCode:ui::VKEY_UNKNOWN 901 keyCode:ui::VKEY_UNKNOWN
902 domCode:ui::DomCode::NONE 902 domCode:ui::DomCode::NONE
903 eventFlags:0]; 903 eventFlags:0];
904 } 904 }
905 905
906 - (void)moveUpAndModifySelection:(id)sender { 906 - (void)moveUpAndModifySelection:(id)sender {
907 [self handleAction:ui::TextEditCommand:: 907 [self handleAction:ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION
908 MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
909 keyCode:ui::VKEY_UP 908 keyCode:ui::VKEY_UP
910 domCode:ui::DomCode::ARROW_UP 909 domCode:ui::DomCode::ARROW_UP
911 eventFlags:ui::EF_SHIFT_DOWN]; 910 eventFlags:ui::EF_SHIFT_DOWN];
912 } 911 }
913 912
914 - (void)moveDownAndModifySelection:(id)sender { 913 - (void)moveDownAndModifySelection:(id)sender {
915 [self 914 [self handleAction:ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION
916 handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 915 keyCode:ui::VKEY_DOWN
917 keyCode:ui::VKEY_DOWN 916 domCode:ui::DomCode::ARROW_DOWN
918 domCode:ui::DomCode::ARROW_DOWN 917 eventFlags:ui::EF_SHIFT_DOWN];
919 eventFlags:ui::EF_SHIFT_DOWN];
920 } 918 }
921 919
922 - (void)moveToBeginningOfLineAndModifySelection:(id)sender { 920 - (void)moveToBeginningOfLineAndModifySelection:(id)sender {
923 [self handleAction:ui::TextEditCommand:: 921 [self handleAction:ui::TextEditCommand::
924 MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION 922 MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
925 keyCode:ui::VKEY_HOME 923 keyCode:ui::VKEY_HOME
926 domCode:ui::DomCode::HOME 924 domCode:ui::DomCode::HOME
927 eventFlags:ui::EF_SHIFT_DOWN]; 925 eventFlags:ui::EF_SHIFT_DOWN];
928 } 926 }
929 927
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 959
962 - (void)moveToBeginningOfDocumentAndModifySelection:(id)sender { 960 - (void)moveToBeginningOfDocumentAndModifySelection:(id)sender {
963 [self handleAction:ui::TextEditCommand:: 961 [self handleAction:ui::TextEditCommand::
964 MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION 962 MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION
965 keyCode:ui::VKEY_HOME 963 keyCode:ui::VKEY_HOME
966 domCode:ui::DomCode::HOME 964 domCode:ui::DomCode::HOME
967 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 965 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
968 } 966 }
969 967
970 - (void)pageDownAndModifySelection:(id)sender { 968 - (void)pageDownAndModifySelection:(id)sender {
971 [self 969 [self handleAction:ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION
972 handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 970 keyCode:ui::VKEY_NEXT
973 keyCode:ui::VKEY_NEXT 971 domCode:ui::DomCode::PAGE_DOWN
974 domCode:ui::DomCode::PAGE_DOWN 972 eventFlags:ui::EF_SHIFT_DOWN];
975 eventFlags:ui::EF_SHIFT_DOWN];
976 } 973 }
977 974
978 - (void)pageUpAndModifySelection:(id)sender { 975 - (void)pageUpAndModifySelection:(id)sender {
979 [self handleAction:ui::TextEditCommand:: 976 [self handleAction:ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION
980 MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
981 keyCode:ui::VKEY_PRIOR 977 keyCode:ui::VKEY_PRIOR
982 domCode:ui::DomCode::PAGE_UP 978 domCode:ui::DomCode::PAGE_UP
983 eventFlags:ui::EF_SHIFT_DOWN]; 979 eventFlags:ui::EF_SHIFT_DOWN];
984 } 980 }
985 981
986 - (void)moveParagraphForwardAndModifySelection:(id)sender { 982 - (void)moveParagraphForwardAndModifySelection:(id)sender {
987 [self 983 [self handleAction:ui::TextEditCommand::
988 handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION 984 MOVE_PARAGRAPH_FORWARD_AND_MODIFY_SELECTION
989 keyCode:ui::VKEY_DOWN 985 keyCode:ui::VKEY_DOWN
990 domCode:ui::DomCode::ARROW_DOWN 986 domCode:ui::DomCode::ARROW_DOWN
991 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 987 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
992 } 988 }
993 989
994 - (void)moveParagraphBackwardAndModifySelection:(id)sender { 990 - (void)moveParagraphBackwardAndModifySelection:(id)sender {
995 [self handleAction:ui::TextEditCommand:: 991 [self handleAction:ui::TextEditCommand::
996 MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION 992 MOVE_PARAGRAPH_BACKWARD_AND_MODIFY_SELECTION
997 keyCode:ui::VKEY_UP 993 keyCode:ui::VKEY_UP
998 domCode:ui::DomCode::ARROW_UP 994 domCode:ui::DomCode::ARROW_UP
999 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN]; 995 eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
1000 } 996 }
1001 997
1002 - (void)moveWordRight:(id)sender { 998 - (void)moveWordRight:(id)sender {
1003 [self handleAction:ui::TextEditCommand::MOVE_WORD_RIGHT 999 [self handleAction:ui::TextEditCommand::MOVE_WORD_RIGHT
1004 keyCode:ui::VKEY_RIGHT 1000 keyCode:ui::VKEY_RIGHT
1005 domCode:ui::DomCode::ARROW_RIGHT 1001 domCode:ui::DomCode::ARROW_RIGHT
1006 eventFlags:ui::EF_CONTROL_DOWN]; 1002 eventFlags:ui::EF_CONTROL_DOWN];
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 } 1353 }
1358 1354
1359 return [super accessibilityAttributeValue:attribute]; 1355 return [super accessibilityAttributeValue:attribute];
1360 } 1356 }
1361 1357
1362 - (id)accessibilityHitTest:(NSPoint)point { 1358 - (id)accessibilityHitTest:(NSPoint)point {
1363 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point]; 1359 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
1364 } 1360 }
1365 1361
1366 @end 1362 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698