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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/textfield/textfield.cc

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: Add apple rdar in comment. 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 side-by-side diff with in-line comments
Download patch
« ui/views/cocoa/bridged_native_widget_unittest.mm ('K') | « ui/views/cocoa/bridged_native_widget_unittest.mm ('k') | ui/views/controls/textfield/textfield_model.h » ('j') | ui/views/controls/textfield/textfield_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 1f940c5e476d76a626c87e4a09caa5b0d229b7c8..86f3df75a3007c128f5a9d772765499c30a61f23 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -61,6 +61,14 @@ namespace views {
namespace {
+#if defined(OS_MACOSX)
+const gfx::SelectionBehavior kLineSelectionBehavior = gfx::SELECTION_EXTEND;
+const gfx::SelectionBehavior kWordSelectionBehavior = gfx::SELECTION_CARET;
+#else
+const gfx::SelectionBehavior kLineSelectionBehavior = gfx::SELECTION_RETAIN;
+const gfx::SelectionBehavior kWordSelectionBehavior = gfx::SELECTION_RETAIN;
+#endif
+
// Default placeholder text color.
const SkColor kDefaultPlaceholderTextColor = SK_ColorLTGRAY;
@@ -1468,6 +1476,8 @@ bool Textfield::IsTextEditCommandEnabled(ui::TextEditCommand command) const {
case ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH:
case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_PARAGRAPH_FORWARD_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_PARAGRAPH_BACKWARD_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_WORD_BACKWARD:
case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_WORD_FORWARD:
@@ -1504,6 +1514,13 @@ bool Textfield::IsTextEditCommandEnabled(ui::TextEditCommand command) const {
case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_UP:
case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
+// On Mac, the textfield should respond to Up/Down arrows keys and
+// PageUp/PageDown.
+#if defined(OS_MACOSX)
+ return true;
+#else
+ return false;
+#endif
case ui::TextEditCommand::INSERT_TEXT:
case ui::TextEditCommand::SET_MARK:
case ui::TextEditCommand::UNSELECT:
@@ -1588,91 +1605,117 @@ void Textfield::ExecuteTextEditCommand(ui::TextEditCommand command) {
break;
case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
- model_->MoveCursor(gfx::LINE_BREAK, begin, true);
+ model_->MoveCursor(gfx::LINE_BREAK, begin, gfx::SELECTION_RETAIN);
text_changed = cursor_changed = model_->Backspace(add_to_kill_buffer);
break;
case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
- model_->MoveCursor(gfx::LINE_BREAK, end, true);
+ model_->MoveCursor(gfx::LINE_BREAK, end, gfx::SELECTION_RETAIN);
text_changed = cursor_changed = model_->Delete(add_to_kill_buffer);
break;
case ui::TextEditCommand::DELETE_WORD_BACKWARD:
- model_->MoveCursor(gfx::WORD_BREAK, begin, true);
+ model_->MoveCursor(gfx::WORD_BREAK, begin, gfx::SELECTION_RETAIN);
text_changed = cursor_changed = model_->Backspace(add_to_kill_buffer);
break;
case ui::TextEditCommand::DELETE_WORD_FORWARD:
- model_->MoveCursor(gfx::WORD_BREAK, end, true);
+ model_->MoveCursor(gfx::WORD_BREAK, end, gfx::SELECTION_RETAIN);
text_changed = cursor_changed = model_->Delete(add_to_kill_buffer);
break;
case ui::TextEditCommand::MOVE_BACKWARD:
- model_->MoveCursor(gfx::CHARACTER_BREAK, begin, false);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, begin, gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::CHARACTER_BREAK, begin, true);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, begin, gfx::SELECTION_RETAIN);
break;
case ui::TextEditCommand::MOVE_FORWARD:
- model_->MoveCursor(gfx::CHARACTER_BREAK, end, false);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, end, gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::CHARACTER_BREAK, end, true);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, end, gfx::SELECTION_RETAIN);
break;
case ui::TextEditCommand::MOVE_LEFT:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, false);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT,
+ gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, true);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT,
+ gfx::SELECTION_RETAIN);
break;
case ui::TextEditCommand::MOVE_RIGHT:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, false);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT,
+ gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, true);
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT,
+ gfx::SELECTION_RETAIN);
break;
case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT:
case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE:
case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH:
- model_->MoveCursor(gfx::LINE_BREAK, begin, false);
+ case ui::TextEditCommand::MOVE_UP:
+ case ui::TextEditCommand::MOVE_PAGE_UP:
+ model_->MoveCursor(gfx::LINE_BREAK, begin, gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::
MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
case ui::TextEditCommand::
MOVE_TO_BEGINNING_OF_PARAGRAPH_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::LINE_BREAK, begin, true);
+ model_->MoveCursor(gfx::LINE_BREAK, begin, kLineSelectionBehavior);
+ break;
+ case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::LINE_BREAK, begin, gfx::SELECTION_RETAIN);
break;
case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT:
case ui::TextEditCommand::MOVE_TO_END_OF_LINE:
case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH:
- model_->MoveCursor(gfx::LINE_BREAK, end, false);
+ case ui::TextEditCommand::MOVE_DOWN:
+ case ui::TextEditCommand::MOVE_PAGE_DOWN:
+ model_->MoveCursor(gfx::LINE_BREAK, end, gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::LINE_BREAK, end, true);
+ model_->MoveCursor(gfx::LINE_BREAK, end, kLineSelectionBehavior);
+ break;
+ case ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::LINE_BREAK, end, gfx::SELECTION_RETAIN);
+ break;
+ case ui::TextEditCommand::MOVE_PARAGRAPH_BACKWARD_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::LINE_BREAK, begin, gfx::SELECTION_CARET);
msw 2016/08/16 18:37:58 nit: If we ever add Win/Cros/Linux support, this s
karandeepb 2016/08/17 04:37:23 Done.
+ break;
+ case ui::TextEditCommand::MOVE_PARAGRAPH_FORWARD_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::LINE_BREAK, end, gfx::SELECTION_CARET);
break;
case ui::TextEditCommand::MOVE_WORD_BACKWARD:
- model_->MoveCursor(gfx::WORD_BREAK, begin, false);
+ model_->MoveCursor(gfx::WORD_BREAK, begin, gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::WORD_BREAK, begin, true);
+ model_->MoveCursor(gfx::WORD_BREAK, begin, kWordSelectionBehavior);
break;
case ui::TextEditCommand::MOVE_WORD_FORWARD:
- model_->MoveCursor(gfx::WORD_BREAK, end, false);
+ model_->MoveCursor(gfx::WORD_BREAK, end, gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::WORD_BREAK, end, true);
+ model_->MoveCursor(gfx::WORD_BREAK, end, kWordSelectionBehavior);
break;
case ui::TextEditCommand::MOVE_WORD_LEFT:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, false);
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT,
+ gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, true);
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT,
+ kWordSelectionBehavior);
break;
case ui::TextEditCommand::MOVE_WORD_RIGHT:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, false);
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT,
+ gfx::SELECTION_NONE);
break;
case ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, true);
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT,
+ kWordSelectionBehavior);
break;
case ui::TextEditCommand::UNDO:
text_changed = cursor_changed = model_->Undo();
@@ -1698,14 +1741,6 @@ void Textfield::ExecuteTextEditCommand(ui::TextEditCommand command) {
case ui::TextEditCommand::YANK:
text_changed = cursor_changed = model_->Yank();
break;
- case ui::TextEditCommand::MOVE_DOWN:
- case ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
- case ui::TextEditCommand::MOVE_PAGE_DOWN:
- case ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
- case ui::TextEditCommand::MOVE_PAGE_UP:
- case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
- case ui::TextEditCommand::MOVE_UP:
- case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
case ui::TextEditCommand::INSERT_TEXT:
case ui::TextEditCommand::SET_MARK:
case ui::TextEditCommand::UNSELECT:
@@ -1817,10 +1852,12 @@ void Textfield::SelectThroughLastDragLocation() {
const bool drags_to_end = PlatformStyle::kTextfieldDragVerticallyDragsToEnd;
if (drags_to_end && last_drag_location_.y() < 0) {
model_->MoveCursor(gfx::BreakType::LINE_BREAK,
- gfx::VisualCursorDirection::CURSOR_LEFT, true);
+ gfx::VisualCursorDirection::CURSOR_LEFT,
+ gfx::SELECTION_RETAIN);
} else if (drags_to_end && last_drag_location_.y() > height()) {
model_->MoveCursor(gfx::BreakType::LINE_BREAK,
- gfx::VisualCursorDirection::CURSOR_RIGHT, true);
+ gfx::VisualCursorDirection::CURSOR_RIGHT,
+ gfx::SELECTION_RETAIN);
} else {
model_->MoveCursorTo(last_drag_location_, true);
}
« ui/views/cocoa/bridged_native_widget_unittest.mm ('K') | « ui/views/cocoa/bridged_native_widget_unittest.mm ('k') | ui/views/controls/textfield/textfield_model.h » ('j') | ui/views/controls/textfield/textfield_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698