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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2029733003: Views: Replace resource ids with ui::TextEditCommand enum for text editing commands in Textfield. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: === Created 4 years, 6 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
« no previous file with comments | « ui/views/controls/textfield/textfield.h ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »
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 658b383a4c5d90148ac9ee75329701dc06f3a15b..a0fc7d542ece9a822c41434e07f1ed7f4b7afa07 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -16,6 +16,7 @@
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/ime/input_method.h"
+#include "ui/base/ime/text_edit_commands.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches_util.h"
#include "ui/compositor/canvas_painter.h"
@@ -51,8 +52,8 @@
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include "base/strings/utf_string_conversions.h"
-#include "ui/events/linux/text_edit_command_auralinux.h"
-#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
+#include "ui/base/ime/linux/text_edit_command_auralinux.h"
+#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
namespace views {
@@ -62,8 +63,6 @@ namespace {
// Default placeholder text color.
const SkColor kDefaultPlaceholderTextColor = SK_ColorLTGRAY;
-const int kNoCommand = 0;
-
void ConvertRectToScreen(const View* src, gfx::Rect* r) {
DCHECK(src);
@@ -85,9 +84,9 @@ int GetDragSelectionDelay() {
}
// Get the default command for a given key |event|.
-int GetCommandForKeyEvent(const ui::KeyEvent& event) {
+ui::TextEditCommand GetCommandForKeyEvent(const ui::KeyEvent& event) {
if (event.type() != ui::ET_KEY_PRESSED || event.IsUnicodeKeyCode())
- return kNoCommand;
+ return ui::TextEditCommand::INVALID_COMMAND;
const bool shift = event.IsShiftDown();
const bool control = event.IsControlDown();
@@ -95,159 +94,111 @@ int GetCommandForKeyEvent(const ui::KeyEvent& event) {
switch (event.key_code()) {
case ui::VKEY_Z:
if (control && !shift && !alt)
- return IDS_APP_UNDO;
- return (control && shift && !alt) ? IDS_APP_REDO : kNoCommand;
+ return ui::TextEditCommand::UNDO;
+ return (control && shift && !alt) ? ui::TextEditCommand::REDO
+ : ui::TextEditCommand::INVALID_COMMAND;
case ui::VKEY_Y:
- return (control && !alt) ? IDS_APP_REDO : kNoCommand;
+ return (control && !alt) ? ui::TextEditCommand::REDO
+ : ui::TextEditCommand::INVALID_COMMAND;
case ui::VKEY_A:
- return (control && !alt) ? IDS_APP_SELECT_ALL : kNoCommand;
+ return (control && !alt) ? ui::TextEditCommand::SELECT_ALL
+ : ui::TextEditCommand::INVALID_COMMAND;
case ui::VKEY_X:
- return (control && !alt) ? IDS_APP_CUT : kNoCommand;
+ return (control && !alt) ? ui::TextEditCommand::CUT
+ : ui::TextEditCommand::INVALID_COMMAND;
case ui::VKEY_C:
- return (control && !alt) ? IDS_APP_COPY : kNoCommand;
+ return (control && !alt) ? ui::TextEditCommand::COPY
+ : ui::TextEditCommand::INVALID_COMMAND;
case ui::VKEY_V:
- return (control && !alt) ? IDS_APP_PASTE : kNoCommand;
+ return (control && !alt) ? ui::TextEditCommand::PASTE
+ : ui::TextEditCommand::INVALID_COMMAND;
case ui::VKEY_RIGHT:
// Ignore alt+right, which may be a browser navigation shortcut.
if (alt)
- return kNoCommand;
- if (!shift)
- return control ? IDS_MOVE_WORD_RIGHT : IDS_MOVE_RIGHT;
- return control ? IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION :
- IDS_MOVE_RIGHT_AND_MODIFY_SELECTION;
+ return ui::TextEditCommand::INVALID_COMMAND;
+ if (!shift) {
+ return control ? ui::TextEditCommand::MOVE_WORD_RIGHT
+ : ui::TextEditCommand::MOVE_RIGHT;
+ }
+ return control ? ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION
+ : ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION;
case ui::VKEY_LEFT:
// Ignore alt+left, which may be a browser navigation shortcut.
if (alt)
- return kNoCommand;
- if (!shift)
- return control ? IDS_MOVE_WORD_LEFT : IDS_MOVE_LEFT;
- return control ? IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION :
- IDS_MOVE_LEFT_AND_MODIFY_SELECTION;
+ return ui::TextEditCommand::INVALID_COMMAND;
+ if (!shift) {
+ return control ? ui::TextEditCommand::MOVE_WORD_LEFT
+ : ui::TextEditCommand::MOVE_LEFT;
+ }
+ return control ? ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION
+ : ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION;
case ui::VKEY_HOME:
- return shift ? IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION :
- IDS_MOVE_TO_BEGINNING_OF_LINE;
+ return shift ? ui::TextEditCommand::
+ MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
+ : ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE;
case ui::VKEY_END:
- return shift ? IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION :
- IDS_MOVE_TO_END_OF_LINE;
+ return shift
+ ? ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
+ : ui::TextEditCommand::MOVE_TO_END_OF_LINE;
case ui::VKEY_BACK:
if (!control)
- return IDS_DELETE_BACKWARD;
+ return ui::TextEditCommand::DELETE_BACKWARD;
#if defined(OS_LINUX)
// Only erase by line break on Linux and ChromeOS.
if (shift)
- return IDS_DELETE_TO_BEGINNING_OF_LINE;
+ return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
#endif
- return IDS_DELETE_WORD_BACKWARD;
+ return ui::TextEditCommand::DELETE_WORD_BACKWARD;
case ui::VKEY_DELETE:
#if defined(OS_LINUX)
// Only erase by line break on Linux and ChromeOS.
if (shift && control)
- return IDS_DELETE_TO_END_OF_LINE;
+ return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
#endif
if (control)
- return IDS_DELETE_WORD_FORWARD;
- return shift ? IDS_APP_CUT : IDS_DELETE_FORWARD;
+ return ui::TextEditCommand::DELETE_WORD_FORWARD;
+ return shift ? ui::TextEditCommand::CUT
+ : ui::TextEditCommand::DELETE_FORWARD;
case ui::VKEY_INSERT:
if (control && !shift)
- return IDS_APP_COPY;
- return (shift && !control) ? IDS_APP_PASTE : kNoCommand;
+ return ui::TextEditCommand::COPY;
+ return (shift && !control) ? ui::TextEditCommand::PASTE
+ : ui::TextEditCommand::INVALID_COMMAND;
default:
- return kNoCommand;
- }
-}
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// Convert a custom text edit |command| to the equivalent views command ID.
-int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
- const bool select = command.extend_selection();
- switch (command.command_id()) {
- case ui::TextEditCommandAuraLinux::COPY:
- return IDS_APP_COPY;
- case ui::TextEditCommandAuraLinux::CUT:
- return IDS_APP_CUT;
- case ui::TextEditCommandAuraLinux::DELETE_BACKWARD:
- return IDS_DELETE_BACKWARD;
- case ui::TextEditCommandAuraLinux::DELETE_FORWARD:
- return IDS_DELETE_FORWARD;
- case ui::TextEditCommandAuraLinux::DELETE_TO_BEGINING_OF_LINE:
- case ui::TextEditCommandAuraLinux::DELETE_TO_BEGINING_OF_PARAGRAPH:
- return IDS_DELETE_TO_BEGINNING_OF_LINE;
- case ui::TextEditCommandAuraLinux::DELETE_TO_END_OF_LINE:
- case ui::TextEditCommandAuraLinux::DELETE_TO_END_OF_PARAGRAPH:
- return IDS_DELETE_TO_END_OF_LINE;
- case ui::TextEditCommandAuraLinux::DELETE_WORD_BACKWARD:
- return IDS_DELETE_WORD_BACKWARD;
- case ui::TextEditCommandAuraLinux::DELETE_WORD_FORWARD:
- return IDS_DELETE_WORD_FORWARD;
- case ui::TextEditCommandAuraLinux::INSERT_TEXT:
- return kNoCommand;
- case ui::TextEditCommandAuraLinux::MOVE_BACKWARD:
- if (rtl)
- return select ? IDS_MOVE_RIGHT_AND_MODIFY_SELECTION : IDS_MOVE_RIGHT;
- return select ? IDS_MOVE_LEFT_AND_MODIFY_SELECTION : IDS_MOVE_LEFT;
- case ui::TextEditCommandAuraLinux::MOVE_DOWN:
- return IDS_MOVE_DOWN;
- case ui::TextEditCommandAuraLinux::MOVE_FORWARD:
- if (rtl)
- return select ? IDS_MOVE_LEFT_AND_MODIFY_SELECTION : IDS_MOVE_LEFT;
- return select ? IDS_MOVE_RIGHT_AND_MODIFY_SELECTION : IDS_MOVE_RIGHT;
- case ui::TextEditCommandAuraLinux::MOVE_LEFT:
- return select ? IDS_MOVE_LEFT_AND_MODIFY_SELECTION : IDS_MOVE_LEFT;
- case ui::TextEditCommandAuraLinux::MOVE_PAGE_DOWN:
- case ui::TextEditCommandAuraLinux::MOVE_PAGE_UP:
- return kNoCommand;
- case ui::TextEditCommandAuraLinux::MOVE_RIGHT:
- return select ? IDS_MOVE_RIGHT_AND_MODIFY_SELECTION : IDS_MOVE_RIGHT;
- case ui::TextEditCommandAuraLinux::MOVE_TO_BEGINING_OF_DOCUMENT:
- case ui::TextEditCommandAuraLinux::MOVE_TO_BEGINING_OF_LINE:
- case ui::TextEditCommandAuraLinux::MOVE_TO_BEGINING_OF_PARAGRAPH:
- return select ? IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION :
- IDS_MOVE_TO_BEGINNING_OF_LINE;
- case ui::TextEditCommandAuraLinux::MOVE_TO_END_OF_DOCUMENT:
- case ui::TextEditCommandAuraLinux::MOVE_TO_END_OF_LINE:
- case ui::TextEditCommandAuraLinux::MOVE_TO_END_OF_PARAGRAPH:
- return select ? IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION :
- IDS_MOVE_TO_END_OF_LINE;
- case ui::TextEditCommandAuraLinux::MOVE_UP:
- return IDS_MOVE_UP;
- case ui::TextEditCommandAuraLinux::MOVE_WORD_BACKWARD:
- if (rtl) {
- return select ? IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION :
- IDS_MOVE_WORD_RIGHT;
- }
- return select ? IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION :
- IDS_MOVE_WORD_LEFT;
- case ui::TextEditCommandAuraLinux::MOVE_WORD_FORWARD:
- if (rtl) {
- return select ? IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION :
- IDS_MOVE_WORD_LEFT;
- }
- return select ? IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION :
- IDS_MOVE_WORD_RIGHT;
- case ui::TextEditCommandAuraLinux::MOVE_WORD_LEFT:
- return select ? IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION :
- IDS_MOVE_WORD_LEFT;
- case ui::TextEditCommandAuraLinux::MOVE_WORD_RIGHT:
- return select ? IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION :
- IDS_MOVE_WORD_RIGHT;
- case ui::TextEditCommandAuraLinux::PASTE:
- return IDS_APP_PASTE;
- case ui::TextEditCommandAuraLinux::SELECT_ALL:
- return IDS_APP_SELECT_ALL;
- case ui::TextEditCommandAuraLinux::SET_MARK:
- case ui::TextEditCommandAuraLinux::UNSELECT:
- case ui::TextEditCommandAuraLinux::INVALID_COMMAND:
- return kNoCommand;
+ return ui::TextEditCommand::INVALID_COMMAND;
}
- return kNoCommand;
}
-#endif
const gfx::FontList& GetDefaultFontList() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
}
+// Returns the ui::TextEditCommand corresponding to the |command_id| menu
+// action. |has_selection| is true if the textfield has an active selection.
+// Keep in sync with UpdateContextMenu.
+ui::TextEditCommand GetTextEditCommandFromMenuCommand(int command_id,
+ bool has_selection) {
+ switch (command_id) {
+ case IDS_APP_UNDO:
+ return ui::TextEditCommand::UNDO;
+ case IDS_APP_CUT:
+ return ui::TextEditCommand::CUT;
+ case IDS_APP_COPY:
+ return ui::TextEditCommand::COPY;
+ case IDS_APP_PASTE:
+ return ui::TextEditCommand::PASTE;
+ case IDS_APP_DELETE:
+ // The DELETE menu action only works in case of an active selection.
+ if (has_selection)
+ return ui::TextEditCommand::DELETE_FORWARD;
+ break;
+ case IDS_APP_SELECT_ALL:
+ return ui::TextEditCommand::SELECT_ALL;
+ }
+ return ui::TextEditCommand::INVALID_COMMAND;
+}
+
} // namespace
// static
@@ -268,7 +219,7 @@ size_t Textfield::GetCaretBlinkMs() {
Textfield::Textfield()
: model_(new TextfieldModel(this)),
controller_(NULL),
- scheduled_edit_command_(kNoCommand),
+ scheduled_text_edit_command_(ui::TextEditCommand::INVALID_COMMAND),
read_only_(false),
default_width_in_chars_(0),
use_default_text_color_(true),
@@ -566,10 +517,6 @@ void Textfield::SetAccessibleName(const base::string16& name) {
accessible_name_ = name;
}
-void Textfield::ExecuteCommand(int command_id) {
- ExecuteCommand(command_id, ui::EF_NONE);
-}
-
bool Textfield::HasTextBeingDragged() {
return initiating_drag_;
}
@@ -693,8 +640,8 @@ void Textfield::OnMouseReleased(const ui::MouseEvent& event) {
}
bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
- int edit_command = scheduled_edit_command_;
- scheduled_edit_command_ = kNoCommand;
+ ui::TextEditCommand edit_command = scheduled_text_edit_command_;
+ scheduled_text_edit_command_ = ui::TextEditCommand::INVALID_COMMAND;
// Since HandleKeyEvent() might destroy |this|, get a weak pointer and verify
// it isn't null before proceeding.
@@ -710,11 +657,9 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
ui::GetTextEditKeyBindingsDelegate();
std::vector<ui::TextEditCommandAuraLinux> commands;
if (!handled && delegate && delegate->MatchEvent(event, &commands)) {
- const bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
for (size_t i = 0; i < commands.size(); ++i) {
- const int command = GetViewsCommand(commands[i], rtl);
- if (IsCommandIdEnabled(command)) {
- ExecuteCommand(command);
+ if (IsTextEditCommandEnabled(commands[i].command())) {
+ ExecuteTextEditCommand(commands[i].command());
handled = true;
}
}
@@ -722,11 +667,11 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
}
#endif
- if (edit_command == kNoCommand)
+ if (edit_command == ui::TextEditCommand::INVALID_COMMAND)
edit_command = GetCommandForKeyEvent(event);
- if (!handled && IsCommandIdEnabled(edit_command)) {
- ExecuteCommand(edit_command);
+ if (!handled && IsTextEditCommandEnabled(edit_command)) {
+ ExecuteTextEditCommand(edit_command);
handled = true;
}
return handled;
@@ -830,7 +775,7 @@ void Textfield::OnGestureEvent(ui::GestureEvent* event) {
bool Textfield::AcceleratorPressed(const ui::Accelerator& accelerator) {
ui::KeyEvent event(accelerator.type(), accelerator.key_code(),
accelerator.modifiers());
- ExecuteCommand(GetCommandForKeyEvent(event));
+ ExecuteTextEditCommand(GetCommandForKeyEvent(event));
return true;
}
@@ -849,9 +794,8 @@ bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
ui::GetTextEditKeyBindingsDelegate();
std::vector<ui::TextEditCommandAuraLinux> commands;
if (delegate && delegate->MatchEvent(event, &commands)) {
- const bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
for (size_t i = 0; i < commands.size(); ++i)
- if (IsCommandIdEnabled(GetViewsCommand(commands[i], rtl)))
+ if (IsTextEditCommandEnabled(commands[i].command()))
return true;
}
#endif
@@ -1224,49 +1168,8 @@ bool Textfield::IsCommandIdChecked(int command_id) const {
}
bool Textfield::IsCommandIdEnabled(int command_id) const {
- base::string16 result;
- bool editable = !read_only();
- bool readable = text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD;
- switch (command_id) {
- case IDS_APP_UNDO:
- return editable && model_->CanUndo();
- case IDS_APP_REDO:
- return editable && model_->CanRedo();
- case IDS_APP_CUT:
- return editable && readable && model_->HasSelection();
- case IDS_APP_COPY:
- return readable && model_->HasSelection();
- case IDS_APP_PASTE:
- ui::Clipboard::GetForCurrentThread()->ReadText(
- ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
- return editable && !result.empty();
- case IDS_APP_DELETE:
- return editable && model_->HasSelection();
- case IDS_APP_SELECT_ALL:
- return !text().empty();
- case IDS_DELETE_FORWARD:
- case IDS_DELETE_BACKWARD:
- case IDS_DELETE_TO_BEGINNING_OF_LINE:
- case IDS_DELETE_TO_END_OF_LINE:
- case IDS_DELETE_WORD_BACKWARD:
- case IDS_DELETE_WORD_FORWARD:
- return editable;
- case IDS_MOVE_LEFT:
- case IDS_MOVE_LEFT_AND_MODIFY_SELECTION:
- case IDS_MOVE_RIGHT:
- case IDS_MOVE_RIGHT_AND_MODIFY_SELECTION:
- case IDS_MOVE_WORD_LEFT:
- case IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
- case IDS_MOVE_WORD_RIGHT:
- case IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
- case IDS_MOVE_TO_BEGINNING_OF_LINE:
- case IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
- case IDS_MOVE_TO_END_OF_LINE:
- case IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
- return true;
- default:
- return false;
- }
+ return Textfield::IsTextEditCommandEnabled(
+ GetTextEditCommandFromMenuCommand(command_id, HasSelection()));
}
bool Textfield::GetAcceleratorForCommandId(int command_id,
@@ -1298,124 +1201,8 @@ bool Textfield::GetAcceleratorForCommandId(int command_id,
}
void Textfield::ExecuteCommand(int command_id, int event_flags) {
- DestroyTouchSelection();
-
- // Some codepaths may bypass GetCommandForKeyEvent, so any selection-dependent
- // modifications of the command should happen here.
- if (HasSelection()) {
- switch (command_id) {
- case IDS_DELETE_WORD_BACKWARD:
- case IDS_DELETE_TO_BEGINNING_OF_LINE:
- command_id = IDS_DELETE_BACKWARD;
- break;
- case IDS_DELETE_WORD_FORWARD:
- case IDS_DELETE_TO_END_OF_LINE:
- command_id = IDS_DELETE_FORWARD;
- break;
- }
- }
-
- if (!IsCommandIdEnabled(command_id))
- return;
-
- bool text_changed = false;
- bool cursor_changed = false;
- bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
- gfx::VisualCursorDirection begin = rtl ? gfx::CURSOR_RIGHT : gfx::CURSOR_LEFT;
- gfx::VisualCursorDirection end = rtl ? gfx::CURSOR_LEFT : gfx::CURSOR_RIGHT;
- gfx::SelectionModel selection_model = GetSelectionModel();
-
- OnBeforeUserAction();
- switch (command_id) {
- case IDS_APP_UNDO:
- text_changed = cursor_changed = model_->Undo();
- break;
- case IDS_APP_REDO:
- text_changed = cursor_changed = model_->Redo();
- break;
- case IDS_APP_CUT:
- text_changed = cursor_changed = Cut();
- break;
- case IDS_APP_COPY:
- Copy();
- break;
- case IDS_APP_PASTE:
- text_changed = cursor_changed = Paste();
- break;
- case IDS_APP_DELETE:
- text_changed = cursor_changed = model_->Delete();
- break;
- case IDS_APP_SELECT_ALL:
- SelectAll(false);
- break;
- case IDS_DELETE_BACKWARD:
- text_changed = cursor_changed = model_->Backspace();
- break;
- case IDS_DELETE_FORWARD:
- text_changed = cursor_changed = model_->Delete();
- break;
- case IDS_DELETE_TO_END_OF_LINE:
- model_->MoveCursor(gfx::LINE_BREAK, end, true);
- text_changed = cursor_changed = model_->Delete();
- break;
- case IDS_DELETE_TO_BEGINNING_OF_LINE:
- model_->MoveCursor(gfx::LINE_BREAK, begin, true);
- text_changed = cursor_changed = model_->Backspace();
- break;
- case IDS_DELETE_WORD_BACKWARD:
- model_->MoveCursor(gfx::WORD_BREAK, begin, true);
- text_changed = cursor_changed = model_->Backspace();
- break;
- case IDS_DELETE_WORD_FORWARD:
- model_->MoveCursor(gfx::WORD_BREAK, end, true);
- text_changed = cursor_changed = model_->Delete();
- break;
- case IDS_MOVE_LEFT:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, false);
- break;
- case IDS_MOVE_LEFT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, true);
- break;
- case IDS_MOVE_RIGHT:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, false);
- break;
- case IDS_MOVE_RIGHT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, true);
- break;
- case IDS_MOVE_WORD_LEFT:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, false);
- break;
- case IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, true);
- break;
- case IDS_MOVE_WORD_RIGHT:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, false);
- break;
- case IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, true);
- break;
- case IDS_MOVE_TO_BEGINNING_OF_LINE:
- model_->MoveCursor(gfx::LINE_BREAK, begin, false);
- break;
- case IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::LINE_BREAK, begin, true);
- break;
- case IDS_MOVE_TO_END_OF_LINE:
- model_->MoveCursor(gfx::LINE_BREAK, end, false);
- break;
- case IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
- model_->MoveCursor(gfx::LINE_BREAK, end, true);
- break;
- default:
- NOTREACHED();
- break;
- }
-
- cursor_changed |= GetSelectionModel() != selection_model;
- if (cursor_changed)
- UpdateSelectionClipboard();
- UpdateAfterChange(text_changed, cursor_changed);
- OnAfterUserAction();
+ Textfield::ExecuteTextEditCommand(
+ GetTextEditCommandFromMenuCommand(command_id, HasSelection()));
}
////////////////////////////////////////////////////////////////////////////////
@@ -1641,13 +1428,86 @@ void Textfield::ExtendSelectionAndDelete(size_t before, size_t after) {
void Textfield::EnsureCaretInRect(const gfx::Rect& rect) {}
-bool Textfield::IsEditCommandEnabled(int command_id) const {
- return IsCommandIdEnabled(command_id);
+bool Textfield::IsTextEditCommandEnabled(ui::TextEditCommand command) const {
+ base::string16 result;
+ bool editable = !read_only();
+ bool readable = text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD;
+ switch (command) {
+ case ui::TextEditCommand::DELETE_BACKWARD:
+ case ui::TextEditCommand::DELETE_FORWARD:
+ case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
+ case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+ case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
+ case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
+ case ui::TextEditCommand::DELETE_WORD_BACKWARD:
+ case ui::TextEditCommand::DELETE_WORD_FORWARD:
+ return editable;
+ case ui::TextEditCommand::MOVE_BACKWARD:
+ case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_FORWARD:
+ case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_LEFT:
+ case ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_RIGHT:
+ case ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT:
+ case ui::TextEditCommand::
+ MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE:
+ case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH:
+ case ui::TextEditCommand::
+ MOVE_TO_BEGINNING_OF_PARAGRAPH_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT:
+ case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_TO_END_OF_LINE:
+ 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_WORD_BACKWARD:
+ case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_WORD_FORWARD:
+ case ui::TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_WORD_LEFT:
+ case ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
+ case ui::TextEditCommand::MOVE_WORD_RIGHT:
+ case ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
+ return true;
+ case ui::TextEditCommand::UNDO:
+ return editable && model_->CanUndo();
+ case ui::TextEditCommand::REDO:
+ return editable && model_->CanRedo();
+ case ui::TextEditCommand::CUT:
+ return editable && readable && model_->HasSelection();
+ case ui::TextEditCommand::COPY:
+ return readable && model_->HasSelection();
+ case ui::TextEditCommand::PASTE:
+ ui::Clipboard::GetForCurrentThread()->ReadText(
+ ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
+ return editable && !result.empty();
+ case ui::TextEditCommand::SELECT_ALL:
+ return !text().empty();
+ 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:
+ case ui::TextEditCommand::INVALID_COMMAND:
+ return false;
+ }
+ NOTREACHED();
+ return false;
}
-void Textfield::SetEditCommandForNextKeyEvent(int command_id) {
- DCHECK_EQ(kNoCommand, scheduled_edit_command_);
- scheduled_edit_command_ = command_id;
+void Textfield::SetTextEditCommandForNextKeyEvent(ui::TextEditCommand command) {
+ DCHECK_EQ(ui::TextEditCommand::INVALID_COMMAND, scheduled_text_edit_command_);
+ scheduled_text_edit_command_ = command;
}
////////////////////////////////////////////////////////////////////////////////
@@ -1677,6 +1537,175 @@ base::string16 Textfield::GetSelectionClipboardText() const {
return selection_clipboard_text;
}
+void Textfield::ExecuteTextEditCommand(ui::TextEditCommand command) {
+ DestroyTouchSelection();
+
+ // Some codepaths may bypass GetCommandForKeyEvent, so any selection-dependent
+ // modifications of the command should happen here.
+ if (HasSelection()) {
+ switch (command) {
+ case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
+ case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+ case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
+ case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
+ case ui::TextEditCommand::DELETE_WORD_BACKWARD:
+ case ui::TextEditCommand::DELETE_WORD_FORWARD:
+ command = ui::TextEditCommand::DELETE_FORWARD;
+ break;
+ default:
+ break;
+ }
+ }
+
+ // We only execute the commands enabled in Textfield::IsTextEditCommandEnabled
+ // below. Hence don't do a virtual IsTextEditCommandEnabled call.
+ if (!Textfield::IsTextEditCommandEnabled(command))
+ return;
+
+ bool text_changed = false;
+ bool cursor_changed = false;
+ bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
+ gfx::VisualCursorDirection begin = rtl ? gfx::CURSOR_RIGHT : gfx::CURSOR_LEFT;
+ gfx::VisualCursorDirection end = rtl ? gfx::CURSOR_LEFT : gfx::CURSOR_RIGHT;
+ gfx::SelectionModel selection_model = GetSelectionModel();
+
+ OnBeforeUserAction();
+ switch (command) {
+ case ui::TextEditCommand::DELETE_BACKWARD:
+ text_changed = cursor_changed = model_->Backspace();
+ break;
+ case ui::TextEditCommand::DELETE_FORWARD:
+ text_changed = cursor_changed = model_->Delete();
+ break;
+ case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
+ case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+ model_->MoveCursor(gfx::LINE_BREAK, begin, true);
+ text_changed = cursor_changed = model_->Backspace();
+ break;
+ case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
+ case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
+ model_->MoveCursor(gfx::LINE_BREAK, end, true);
+ text_changed = cursor_changed = model_->Delete();
+ break;
+ case ui::TextEditCommand::DELETE_WORD_BACKWARD:
+ model_->MoveCursor(gfx::WORD_BREAK, begin, true);
+ text_changed = cursor_changed = model_->Backspace();
+ break;
+ case ui::TextEditCommand::DELETE_WORD_FORWARD:
+ model_->MoveCursor(gfx::WORD_BREAK, end, true);
+ text_changed = cursor_changed = model_->Delete();
+ break;
+ case ui::TextEditCommand::MOVE_BACKWARD:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, begin, false);
+ break;
+ case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, begin, true);
+ break;
+ case ui::TextEditCommand::MOVE_FORWARD:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, end, false);
+ break;
+ case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, end, true);
+ break;
+ case ui::TextEditCommand::MOVE_LEFT:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, false);
+ break;
+ case ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, true);
+ break;
+ case ui::TextEditCommand::MOVE_RIGHT:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, false);
+ break;
+ case ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, true);
+ 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);
+ 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);
+ 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);
+ 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);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_BACKWARD:
+ model_->MoveCursor(gfx::WORD_BREAK, begin, false);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::WORD_BREAK, begin, true);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_FORWARD:
+ model_->MoveCursor(gfx::WORD_BREAK, end, false);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::WORD_BREAK, end, true);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_LEFT:
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, false);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, true);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_RIGHT:
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, false);
+ break;
+ case ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
+ model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, true);
+ break;
+ case ui::TextEditCommand::UNDO:
+ text_changed = cursor_changed = model_->Undo();
+ break;
+ case ui::TextEditCommand::REDO:
+ text_changed = cursor_changed = model_->Redo();
+ break;
+ case ui::TextEditCommand::CUT:
+ text_changed = cursor_changed = Cut();
+ break;
+ case ui::TextEditCommand::COPY:
+ Copy();
+ break;
+ case ui::TextEditCommand::PASTE:
+ text_changed = cursor_changed = Paste();
+ break;
+ case ui::TextEditCommand::SELECT_ALL:
+ SelectAll(false);
+ 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:
+ case ui::TextEditCommand::INVALID_COMMAND:
+ NOTREACHED();
+ break;
+ }
+
+ cursor_changed |= GetSelectionModel() != selection_model;
+ if (cursor_changed)
+ UpdateSelectionClipboard();
+ UpdateAfterChange(text_changed, cursor_changed);
+ OnAfterUserAction();
+}
+
////////////////////////////////////////////////////////////////////////////////
// Textfield, private:
@@ -1853,6 +1882,9 @@ void Textfield::UpdateContextMenu() {
context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
IDS_APP_SELECT_ALL);
+
+ // If the controller adds menu commands, also override ExecuteCommand() and
+ // IsCommandIdEnabled() as appropriate, for the commands added.
if (controller_)
controller_->UpdateContextMenu(context_menu_contents_.get());
}
« no previous file with comments | « ui/views/controls/textfield/textfield.h ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698