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

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

Issue 2541313002: RenderTextHarfBuzz: Add support for multi line text selection. (Closed)
Patch Set: Fix test. Created 4 years 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/label.h ('k') | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index ce7ee0247b2e31a48edf9f62d90025d62f4eb350..9b04c091ff1ab436580068f0d8a18cb0e9526562 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -175,8 +175,6 @@ void Label::SetMultiLine(bool multi_line) {
if (render_text_->MultilineSupported())
render_text_->SetMultiline(multi_line);
render_text_->SetReplaceNewlineCharsWithSymbols(!multi_line);
- if (multi_line)
- SetSelectable(false);
ResetLayout();
}
@@ -250,7 +248,7 @@ base::string16 Label::GetDisplayTextForTesting() {
}
bool Label::IsSelectionSupported() const {
- return !multi_line() && !obscured() && render_text_->IsSelectionSupported();
+ return !obscured() && render_text_->IsSelectionSupported();
}
bool Label::SetSelectable(bool value) {
« no previous file with comments | « ui/views/controls/label.h ('k') | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698