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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 329813003: Reland: Use labels to display views tab titles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Call AddChildView(title_) on Tab to prevent leaks. Created 6 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/label_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/message_box_view.cc
diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index 20caaa89a025badcdf3b0d1bd513f25d9c310dd4..df93a054a9bf63d24fe09ec1d5625427a84ea747 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -1,279 +1,271 @@
-// Copyright (c) 2012 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.
-
-#include "ui/views/controls/message_box_view.h"
-
-#include "base/i18n/rtl.h"
-#include "base/message_loop/message_loop.h"
-#include "base/strings/string_split.h"
-#include "base/strings/utf_string_conversions.h"
-#include "ui/accessibility/ax_view_state.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/views/controls/button/checkbox.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/controls/link.h"
-#include "ui/views/controls/textfield/textfield.h"
-#include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/window/client_view.h"
-#include "ui/views/window/dialog_delegate.h"
-
-namespace {
-
-const int kDefaultMessageWidth = 320;
-
-// Paragraph separators are defined in
-// http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBidiClass.txt
-//
-// # Bidi_Class=Paragraph_Separator
-//
-// 000A ; B # Cc <control-000A>
-// 000D ; B # Cc <control-000D>
-// 001C..001E ; B # Cc [3] <control-001C>..<control-001E>
-// 0085 ; B # Cc <control-0085>
-// 2029 ; B # Zp PARAGRAPH SEPARATOR
-bool IsParagraphSeparator(base::char16 c) {
- return ( c == 0x000A || c == 0x000D || c == 0x001C || c == 0x001D ||
- c == 0x001E || c == 0x0085 || c == 0x2029);
-}
-
-// Splits |text| into a vector of paragraphs.
-// Given an example "\nabc\ndef\n\n\nhij\n", the split results should be:
-// "", "abc", "def", "", "", "hij", and "".
-void SplitStringIntoParagraphs(const base::string16& text,
- std::vector<base::string16>* paragraphs) {
- paragraphs->clear();
-
- size_t start = 0;
- for (size_t i = 0; i < text.length(); ++i) {
- if (IsParagraphSeparator(text[i])) {
- paragraphs->push_back(text.substr(start, i - start));
- start = i + 1;
- }
- }
- paragraphs->push_back(text.substr(start, text.length() - start));
-}
-
-} // namespace
-
-namespace views {
-
-///////////////////////////////////////////////////////////////////////////////
-// MessageBoxView, public:
-
-MessageBoxView::InitParams::InitParams(const base::string16& message)
- : options(NO_OPTIONS),
- message(message),
- message_width(kDefaultMessageWidth),
- inter_row_vertical_spacing(kRelatedControlVerticalSpacing) {}
-
-MessageBoxView::InitParams::~InitParams() {
-}
-
-MessageBoxView::MessageBoxView(const InitParams& params)
- : prompt_field_(NULL),
- icon_(NULL),
- checkbox_(NULL),
- link_(NULL),
- message_width_(params.message_width) {
- Init(params);
-}
-
-MessageBoxView::~MessageBoxView() {}
-
-base::string16 MessageBoxView::GetInputText() {
- return prompt_field_ ? prompt_field_->text() : base::string16();
-}
-
-bool MessageBoxView::IsCheckBoxSelected() {
- return checkbox_ ? checkbox_->checked() : false;
-}
-
-void MessageBoxView::SetIcon(const gfx::ImageSkia& icon) {
- if (!icon_)
- icon_ = new ImageView();
- icon_->SetImage(icon);
- icon_->SetBounds(0, 0, icon.width(), icon.height());
- ResetLayoutManager();
-}
-
-void MessageBoxView::SetCheckBoxLabel(const base::string16& label) {
- if (!checkbox_)
- checkbox_ = new Checkbox(label);
- else
- checkbox_->SetText(label);
- ResetLayoutManager();
-}
-
-void MessageBoxView::SetCheckBoxSelected(bool selected) {
- if (!checkbox_)
- return;
- checkbox_->SetChecked(selected);
-}
-
-void MessageBoxView::SetLink(const base::string16& text,
- LinkListener* listener) {
- if (text.empty()) {
- DCHECK(!listener);
- delete link_;
- link_ = NULL;
- } else {
- DCHECK(listener);
- if (!link_) {
- link_ = new Link();
- link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- }
- link_->SetText(text);
- link_->set_listener(listener);
- }
- ResetLayoutManager();
-}
-
-void MessageBoxView::GetAccessibleState(ui::AXViewState* state) {
- state->role = ui::AX_ROLE_ALERT;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// MessageBoxView, View overrides:
-
-void MessageBoxView::ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) {
- if (details.child == this && details.is_add) {
- if (prompt_field_)
- prompt_field_->SelectAll(true);
-
- NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
- }
-}
-
-bool MessageBoxView::AcceleratorPressed(const ui::Accelerator& accelerator) {
- // We only accepts Ctrl-C.
- DCHECK(accelerator.key_code() == 'C' && accelerator.IsCtrlDown());
-
- // We must not intercept Ctrl-C when we have a text box and it's focused.
- if (prompt_field_ && prompt_field_->HasFocus())
- return false;
-
- ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
- if (!clipboard)
- return false;
-
- ui::ScopedClipboardWriter scw(clipboard, ui::CLIPBOARD_TYPE_COPY_PASTE);
- base::string16 text = message_labels_[0]->text();
- for (size_t i = 1; i < message_labels_.size(); ++i)
- text += message_labels_[i]->text();
- scw.WriteText(text);
- return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// MessageBoxView, private:
-
-void MessageBoxView::Init(const InitParams& params) {
- if (params.options & DETECT_DIRECTIONALITY) {
- std::vector<base::string16> texts;
- SplitStringIntoParagraphs(params.message, &texts);
- // If the text originates from a web page, its alignment is based on its
- // first character with strong directionality.
- base::i18n::TextDirection message_direction =
- base::i18n::GetFirstStrongCharacterDirection(params.message);
- gfx::HorizontalAlignment alignment =
- (message_direction == base::i18n::RIGHT_TO_LEFT) ?
- gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
- for (size_t i = 0; i < texts.size(); ++i) {
- Label* message_label = new Label(texts[i]);
- // Don't set multi-line to true if the text is empty, else the label will
- // have a height of 0.
- message_label->SetMultiLine(!texts[i].empty());
- message_label->SetAllowCharacterBreak(true);
- message_label->set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
- message_label->SetHorizontalAlignment(alignment);
- message_labels_.push_back(message_label);
- }
- } else {
- Label* message_label = new Label(params.message);
- message_label->SetMultiLine(true);
- message_label->SetAllowCharacterBreak(true);
- message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- message_labels_.push_back(message_label);
- }
-
- if (params.options & HAS_PROMPT_FIELD) {
- prompt_field_ = new Textfield;
- prompt_field_->SetText(params.default_prompt);
- }
-
- inter_row_vertical_spacing_ = params.inter_row_vertical_spacing;
-
- ResetLayoutManager();
-}
-
-void MessageBoxView::ResetLayoutManager() {
- // Initialize the Grid Layout Manager used for this dialog box.
- GridLayout* layout = GridLayout::CreatePanel(this);
- SetLayoutManager(layout);
-
- gfx::Size icon_size;
- if (icon_)
- icon_size = icon_->GetPreferredSize();
-
- // Add the column set for the message displayed at the top of the dialog box.
- // And an icon, if one has been set.
- const int message_column_view_set_id = 0;
- ColumnSet* column_set = layout->AddColumnSet(message_column_view_set_id);
- if (icon_) {
- column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
- GridLayout::FIXED, icon_size.width(),
- icon_size.height());
- column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing);
- }
- column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
- GridLayout::FIXED, message_width_, 0);
-
- // Column set for extra elements, if any.
- const int extra_column_view_set_id = 1;
- if (prompt_field_ || checkbox_ || link_) {
- column_set = layout->AddColumnSet(extra_column_view_set_id);
- if (icon_) {
- column_set->AddPaddingColumn(
- 0, icon_size.width() + kUnrelatedControlHorizontalSpacing);
- }
- column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
- GridLayout::USE_PREF, 0, 0);
- }
-
- for (size_t i = 0; i < message_labels_.size(); ++i) {
- layout->StartRow(i, message_column_view_set_id);
- if (icon_) {
- if (i == 0)
- layout->AddView(icon_);
- else
- layout->SkipColumns(1);
- }
- layout->AddView(message_labels_[i]);
- }
-
- if (prompt_field_) {
- layout->AddPaddingRow(0, inter_row_vertical_spacing_);
- layout->StartRow(0, extra_column_view_set_id);
- layout->AddView(prompt_field_);
- }
-
- if (checkbox_) {
- layout->AddPaddingRow(0, inter_row_vertical_spacing_);
- layout->StartRow(0, extra_column_view_set_id);
- layout->AddView(checkbox_);
- }
-
- if (link_) {
- layout->AddPaddingRow(0, inter_row_vertical_spacing_);
- layout->StartRow(0, extra_column_view_set_id);
- layout->AddView(link_);
- }
-}
-
-} // namespace views
+// Copyright (c) 2012 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.
+
+#include "ui/views/controls/message_box_view.h"
+
+#include "base/i18n/rtl.h"
+#include "base/message_loop/message_loop.h"
+#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
+#include "ui/accessibility/ax_view_state.h"
+#include "ui/base/clipboard/clipboard.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/controls/link.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/layout_constants.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/window/client_view.h"
+#include "ui/views/window/dialog_delegate.h"
+
+namespace {
+
+const int kDefaultMessageWidth = 320;
+
+// Paragraph separators are defined in
+// http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBidiClass.txt
+//
+// # Bidi_Class=Paragraph_Separator
+//
+// 000A ; B # Cc <control-000A>
+// 000D ; B # Cc <control-000D>
+// 001C..001E ; B # Cc [3] <control-001C>..<control-001E>
+// 0085 ; B # Cc <control-0085>
+// 2029 ; B # Zp PARAGRAPH SEPARATOR
+bool IsParagraphSeparator(base::char16 c) {
+ return ( c == 0x000A || c == 0x000D || c == 0x001C || c == 0x001D ||
+ c == 0x001E || c == 0x0085 || c == 0x2029);
+}
+
+// Splits |text| into a vector of paragraphs.
+// Given an example "\nabc\ndef\n\n\nhij\n", the split results should be:
+// "", "abc", "def", "", "", "hij", and "".
+void SplitStringIntoParagraphs(const base::string16& text,
+ std::vector<base::string16>* paragraphs) {
+ paragraphs->clear();
+
+ size_t start = 0;
+ for (size_t i = 0; i < text.length(); ++i) {
+ if (IsParagraphSeparator(text[i])) {
+ paragraphs->push_back(text.substr(start, i - start));
+ start = i + 1;
+ }
+ }
+ paragraphs->push_back(text.substr(start, text.length() - start));
+}
+
+} // namespace
+
+namespace views {
+
+///////////////////////////////////////////////////////////////////////////////
+// MessageBoxView, public:
+
+MessageBoxView::InitParams::InitParams(const base::string16& message)
+ : options(NO_OPTIONS),
+ message(message),
+ message_width(kDefaultMessageWidth),
+ inter_row_vertical_spacing(kRelatedControlVerticalSpacing) {}
+
+MessageBoxView::InitParams::~InitParams() {
+}
+
+MessageBoxView::MessageBoxView(const InitParams& params)
+ : prompt_field_(NULL),
+ icon_(NULL),
+ checkbox_(NULL),
+ link_(NULL),
+ message_width_(params.message_width) {
+ Init(params);
+}
+
+MessageBoxView::~MessageBoxView() {}
+
+base::string16 MessageBoxView::GetInputText() {
+ return prompt_field_ ? prompt_field_->text() : base::string16();
+}
+
+bool MessageBoxView::IsCheckBoxSelected() {
+ return checkbox_ ? checkbox_->checked() : false;
+}
+
+void MessageBoxView::SetIcon(const gfx::ImageSkia& icon) {
+ if (!icon_)
+ icon_ = new ImageView();
+ icon_->SetImage(icon);
+ icon_->SetBounds(0, 0, icon.width(), icon.height());
+ ResetLayoutManager();
+}
+
+void MessageBoxView::SetCheckBoxLabel(const base::string16& label) {
+ if (!checkbox_)
+ checkbox_ = new Checkbox(label);
+ else
+ checkbox_->SetText(label);
+ ResetLayoutManager();
+}
+
+void MessageBoxView::SetCheckBoxSelected(bool selected) {
+ if (!checkbox_)
+ return;
+ checkbox_->SetChecked(selected);
+}
+
+void MessageBoxView::SetLink(const base::string16& text,
+ LinkListener* listener) {
+ if (text.empty()) {
+ DCHECK(!listener);
+ delete link_;
+ link_ = NULL;
+ } else {
+ DCHECK(listener);
+ if (!link_) {
+ link_ = new Link();
+ link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ }
+ link_->SetText(text);
+ link_->set_listener(listener);
+ }
+ ResetLayoutManager();
+}
+
+void MessageBoxView::GetAccessibleState(ui::AXViewState* state) {
+ state->role = ui::AX_ROLE_ALERT;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// MessageBoxView, View overrides:
+
+void MessageBoxView::ViewHierarchyChanged(
+ const ViewHierarchyChangedDetails& details) {
+ if (details.child == this && details.is_add) {
+ if (prompt_field_)
+ prompt_field_->SelectAll(true);
+
+ NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
+ }
+}
+
+bool MessageBoxView::AcceleratorPressed(const ui::Accelerator& accelerator) {
+ // We only accepts Ctrl-C.
+ DCHECK(accelerator.key_code() == 'C' && accelerator.IsCtrlDown());
+
+ // We must not intercept Ctrl-C when we have a text box and it's focused.
+ if (prompt_field_ && prompt_field_->HasFocus())
+ return false;
+
+ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
+ if (!clipboard)
+ return false;
+
+ ui::ScopedClipboardWriter scw(clipboard, ui::CLIPBOARD_TYPE_COPY_PASTE);
+ base::string16 text = message_labels_[0]->text();
+ for (size_t i = 1; i < message_labels_.size(); ++i)
+ text += message_labels_[i]->text();
+ scw.WriteText(text);
+ return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// MessageBoxView, private:
+
+void MessageBoxView::Init(const InitParams& params) {
+ if (params.options & DETECT_DIRECTIONALITY) {
+ std::vector<base::string16> texts;
+ SplitStringIntoParagraphs(params.message, &texts);
+ for (size_t i = 0; i < texts.size(); ++i) {
+ Label* message_label = new Label(texts[i]);
+ // Avoid empty multi-line labels, which have a height of 0.
+ message_label->SetMultiLine(!texts[i].empty());
+ message_label->SetAllowCharacterBreak(true);
+ message_label->set_directionality_mode(gfx::DIRECTIONALITY_FROM_TEXT);
+ message_label->SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
+ message_labels_.push_back(message_label);
+ }
+ } else {
+ Label* message_label = new Label(params.message);
+ message_label->SetMultiLine(true);
+ message_label->SetAllowCharacterBreak(true);
+ message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ message_labels_.push_back(message_label);
+ }
+
+ if (params.options & HAS_PROMPT_FIELD) {
+ prompt_field_ = new Textfield;
+ prompt_field_->SetText(params.default_prompt);
+ }
+
+ inter_row_vertical_spacing_ = params.inter_row_vertical_spacing;
+
+ ResetLayoutManager();
+}
+
+void MessageBoxView::ResetLayoutManager() {
+ // Initialize the Grid Layout Manager used for this dialog box.
+ GridLayout* layout = GridLayout::CreatePanel(this);
+ SetLayoutManager(layout);
+
+ gfx::Size icon_size;
+ if (icon_)
+ icon_size = icon_->GetPreferredSize();
+
+ // Add the column set for the message displayed at the top of the dialog box.
+ // And an icon, if one has been set.
+ const int message_column_view_set_id = 0;
+ ColumnSet* column_set = layout->AddColumnSet(message_column_view_set_id);
+ if (icon_) {
+ column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
+ GridLayout::FIXED, icon_size.width(),
+ icon_size.height());
+ column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing);
+ }
+ column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+ GridLayout::FIXED, message_width_, 0);
+
+ // Column set for extra elements, if any.
+ const int extra_column_view_set_id = 1;
+ if (prompt_field_ || checkbox_ || link_) {
+ column_set = layout->AddColumnSet(extra_column_view_set_id);
+ if (icon_) {
+ column_set->AddPaddingColumn(
+ 0, icon_size.width() + kUnrelatedControlHorizontalSpacing);
+ }
+ column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+ GridLayout::USE_PREF, 0, 0);
+ }
+
+ for (size_t i = 0; i < message_labels_.size(); ++i) {
+ layout->StartRow(i, message_column_view_set_id);
+ if (icon_) {
+ if (i == 0)
+ layout->AddView(icon_);
+ else
+ layout->SkipColumns(1);
+ }
+ layout->AddView(message_labels_[i]);
+ }
+
+ if (prompt_field_) {
+ layout->AddPaddingRow(0, inter_row_vertical_spacing_);
+ layout->StartRow(0, extra_column_view_set_id);
+ layout->AddView(prompt_field_);
+ }
+
+ if (checkbox_) {
+ layout->AddPaddingRow(0, inter_row_vertical_spacing_);
+ layout->StartRow(0, extra_column_view_set_id);
+ layout->AddView(checkbox_);
+ }
+
+ if (link_) {
+ layout->AddPaddingRow(0, inter_row_vertical_spacing_);
+ layout->StartRow(0, extra_column_view_set_id);
+ layout->AddView(link_);
+ }
+}
+
+} // namespace views
« no previous file with comments | « ui/views/controls/label_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698