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

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

Issue 6318004: Add TextRange and related methods to Textfield Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 11 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
Index: views/controls/textfield/textfield_views_model.cc
diff --git a/views/controls/textfield/textfield_views_model.cc b/views/controls/textfield/textfield_views_model.cc
index 7111ac25e6bbf8fb3f5f6b88771d45a6305c343f..462c97088410f8cff7ee296325c3b4e0a4e1842b 100644
--- a/views/controls/textfield/textfield_views_model.cc
+++ b/views/controls/textfield/textfield_views_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,6 +13,7 @@
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "views/views_delegate.h"
+#include "views/controls/textfield/textfield.h"
namespace views {
@@ -219,6 +220,15 @@ string16 TextfieldViewsModel::GetSelectedText() const {
std::abs(static_cast<long>(cursor_pos_ - selection_begin_)));
}
+void TextfieldViewsModel::GetSelectedRange(TextRange* range) const {
+ range->SetRange(selection_begin_, cursor_pos_);
+}
+
+void TextfieldViewsModel::SelectRange(const TextRange& range) {
+ selection_begin_ = GetSafePosition(range.start());
+ cursor_pos_ = GetSafePosition(range.end());
+}
+
void TextfieldViewsModel::SelectAll() {
cursor_pos_ = 0;
selection_begin_ = text_.length();
@@ -281,4 +291,11 @@ string16 TextfieldViewsModel::GetVisibleText(size_t begin, size_t end) const {
return text_.substr(begin, end - begin);
}
+size_t TextfieldViewsModel::GetSafePosition(size_t position) const {
+ if (position > text_.length()) {
+ return text_.length();
+ }
+ return position;
+}
+
} // namespace views
« no previous file with comments | « views/controls/textfield/textfield_views_model.h ('k') | views/controls/textfield/textfield_views_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698