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

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

Issue 7511029: Implement Pango RenderText for Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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/gfx/render_text_linux.cc ('K') | « ui/ui.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/textfield/textfield_views_model.cc
===================================================================
--- views/controls/textfield/textfield_views_model.cc (revision 99969)
+++ views/controls/textfield/textfield_views_model.cc (working copy)
@@ -606,10 +606,10 @@
void TextfieldViewsModel::CancelCompositionText() {
DCHECK(HasCompositionText());
ui::Range range = render_text_->GetCompositionRange();
+ ClearComposition();
string16 new_text = GetText();
render_text_->SetText(new_text.erase(range.start(), range.length()));
render_text_->SetCursorPosition(range.start());
- ClearComposition();
if (delegate_)
delegate_->OnCompositionTextConfirmedOrCleared();
}
@@ -767,6 +767,7 @@
size_t new_cursor_pos) {
DCHECK_LE(delete_from, delete_to);
string16 text = GetText();
+ ClearComposition();
if (delete_from != delete_to)
render_text_->SetText(text.erase(delete_from, delete_to - delete_from));
if (!new_text.empty())
« ui/gfx/render_text_linux.cc ('K') | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698