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

Side by Side Diff: ui/views/controls/textfield/textfield_views_model.cc

Issue 10807082: Add RenderText DirectionalityMode enum and support; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove errant blank line. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/textfield/textfield_views_model.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "ui/views/controls/textfield/textfield_views_model.h" 5 #include "ui/views/controls/textfield/textfield_views_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/break_iterator.h" 9 #include "base/i18n/break_iterator.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "ui/base/clipboard/clipboard.h" 13 #include "ui/base/clipboard/clipboard.h"
14 #include "ui/base/clipboard/scoped_clipboard_writer.h" 14 #include "ui/base/clipboard/scoped_clipboard_writer.h"
15 #include "ui/base/native_theme/native_theme.h" 15 #include "ui/base/native_theme/native_theme.h"
16 #include "ui/base/range/range.h" 16 #include "ui/base/range/range.h"
17 #include "ui/base/text/utf16_indexing.h" 17 #include "ui/base/text/utf16_indexing.h"
18 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
19 #include "ui/gfx/font.h" 19 #include "ui/gfx/font.h"
20 #include "ui/gfx/render_text.h" 20 #include "ui/gfx/render_text.h"
21 #include "ui/gfx/text_constants.h"
21 #include "ui/views/controls/textfield/textfield.h" 22 #include "ui/views/controls/textfield/textfield.h"
22 #include "ui/views/views_delegate.h" 23 #include "ui/views/views_delegate.h"
23 24
24 namespace views { 25 namespace views {
25 26
26 namespace internal { 27 namespace internal {
27 28
28 // An edit object holds enough information/state to undo/redo the 29 // An edit object holds enough information/state to undo/redo the
29 // change. Two edits are merged when possible, for example, when 30 // change. Two edits are merged when possible, for example, when
30 // you type new characters in sequence. |Commit()| can be used to 31 // you type new characters in sequence. |Commit()| can be used to
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 if (delete_from != delete_to) 781 if (delete_from != delete_to)
781 render_text_->SetText(text.erase(delete_from, delete_to - delete_from)); 782 render_text_->SetText(text.erase(delete_from, delete_to - delete_from));
782 if (!new_text.empty()) 783 if (!new_text.empty())
783 render_text_->SetText(text.insert(new_text_insert_at, new_text)); 784 render_text_->SetText(text.insert(new_text_insert_at, new_text));
784 render_text_->SetCursorPosition(new_cursor_pos); 785 render_text_->SetCursorPosition(new_cursor_pos);
785 // TODO(oshima): mac selects the text that is just undone (but gtk doesn't). 786 // TODO(oshima): mac selects the text that is just undone (but gtk doesn't).
786 // This looks fine feature and we may want to do the same. 787 // This looks fine feature and we may want to do the same.
787 } 788 }
788 789
789 } // namespace views 790 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/textfield_views_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698