Skip to content

GitLab

T
tangled
Commit 531370c7 authored by Orin Jaworski's avatar Orin Jaworski Committed by Commit Bot
Browse files
Options

[omnibox] Use two-line suggestion styling for Pedals 

Pedal suggestions are styled like new answers and entities
with this CL. The logic for deciding layout is also clarified.

Bug: 893183
Change-Id: Id7f4ad9e8a0d6aeffcbe623db65f29107aa79b52
Reviewed-on: https://chromium-review.googlesource.com/c/1330709Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607356}
parent 750261de
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 50 deletions
chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc
View file @ 531370c7
......@@ -179,10 +179,7 @@ void RoundedCornerImageView::OnPaint(gfx::Canvas* canvas) {
////////////////////////////////////////////////////////////////////////////////
// OmniboxMatchCellView:
OmniboxMatchCellView::OmniboxMatchCellView(OmniboxResultView* result_view)
: is_old_style_answer_(false),
is_rich_suggestion_(false),
is_search_type_(false) {
OmniboxMatchCellView::OmniboxMatchCellView(OmniboxResultView* result_view) {
AddChildView(icon_view_ = new views::ImageView());
AddChildView(answer_image_view_ = new RoundedCornerImageView());
AddChildView(content_view_ = new OmniboxTextView(result_view));
......@@ -203,21 +200,29 @@ OmniboxMatchCellView::~OmniboxMatchCellView() = default;
gfx::Size OmniboxMatchCellView::CalculatePreferredSize() const {
int height = 0;
if (is_rich_suggestion_ || should_show_tab_match_) {
height = content_view_->GetLineHeight() +
description_view_->GetHeightForWidth(width() - GetTextIndent());
} else if (is_old_style_answer_) {
int icon_width = icon_view_->width();
int answer_image_size =
answer_image_view_->GetImage().isNull()
? 0
: answer_image_view_->height() + kAnswerIconToTextPadding;
int deduction = icon_width + (HorizontalPadding() * 3) + answer_image_size;
int description_width = std::max(width() - deduction, 0);
height = content_view_->GetLineHeight() +
description_view_->GetHeightForWidth(description_width);
} else {
height = content_view_->GetLineHeight();
switch (layout_style_) {
case LayoutStyle::OLD_ANSWER: {
int icon_width = icon_view_->width();
int answer_image_size =
answer_image_view_->GetImage().isNull()
? 0
: answer_image_view_->height() + kAnswerIconToTextPadding;
int deduction =
icon_width + (HorizontalPadding() * 3) + answer_image_size;
int description_width = std::max(width() - deduction, 0);
height = content_view_->GetLineHeight() +
description_view_->GetHeightForWidth(description_width);
break;
}
case LayoutStyle::ONE_LINE_SUGGESTION: {
height = content_view_->GetLineHeight();
break;
}
case LayoutStyle::TWO_LINE_SUGGESTION: {
height = content_view_->GetLineHeight() +
description_view_->GetHeightForWidth(width() - GetTextIndent());
break;
}
}
height += GetInsets().height();
// Width is not calculated because it's not needed by current callers.
......@@ -235,7 +240,6 @@ int OmniboxMatchCellView::GetTextIndent() {
void OmniboxMatchCellView::OnMatchUpdate(const OmniboxResultView* result_view,
const AutocompleteMatch& match) {
is_old_style_answer_ = !!match.answer;
is_rich_suggestion_ =
(OmniboxFieldTrial::IsNewAnswerLayoutEnabled() &&
(!!match.answer || match.type == AutocompleteMatchType::CALCULATOR)) ||
......@@ -243,9 +247,19 @@ void OmniboxMatchCellView::OnMatchUpdate(const OmniboxResultView* result_view,
!match.image_url.empty());
is_search_type_ = AutocompleteMatch::IsSearchType(match.type);
// For the purpose of layout & presentation, we care about whether the match
// is using the tab switch button, not simply the presence of a matching tab.
should_show_tab_match_ = match.ShouldShowTabMatch();
// Decide layout style once before Layout, while match data is available.
if (is_rich_suggestion_ || match.ShouldShowTabMatch() || match.pedal) {
layout_style_ = LayoutStyle::TWO_LINE_SUGGESTION;
} else if (!!match.answer) {
layout_style_ = LayoutStyle::OLD_ANSWER;
} else {
layout_style_ = LayoutStyle::ONE_LINE_SUGGESTION;
}
// Set up the separator.
separator_view_->SetSize(layout_style_ == LayoutStyle::ONE_LINE_SUGGESTION
? separator_view_->GetPreferredSize()
: gfx::Size());
// Set up the small icon.
if (is_rich_suggestion_) {
......@@ -254,13 +268,6 @@ void OmniboxMatchCellView::OnMatchUpdate(const OmniboxResultView* result_view,
icon_view_->SetSize(icon_view_->CalculatePreferredSize());
}
// Set up the separator.
if (is_old_style_answer_ || is_rich_suggestion_ || should_show_tab_match_) {
separator_view_->SetSize(gfx::Size());
} else {
separator_view_->SetSize(separator_view_->GetPreferredSize());
}
if (OmniboxFieldTrial::IsNewAnswerLayoutEnabled() &&
match.type == AutocompleteMatchType::CALCULATOR) {
answer_image_view_->SetImage(
......@@ -269,7 +276,7 @@ void OmniboxMatchCellView::OnMatchUpdate(const OmniboxResultView* result_view,
answer_image_view_->SetImageSize(
gfx::Size(kNewAnswerImageSize, kNewAnswerImageSize));
} else if (!is_rich_suggestion_) {
// An entry with |is_old_style_answer_| may use the answer_image_view_. But
// An old style answer entry may use the answer_image_view_. But
// it's set when the image arrives (later).
answer_image_view_->SetImage(gfx::ImageSkia());
answer_image_view_->SetSize(gfx::Size());
......@@ -343,9 +350,9 @@ const char* OmniboxMatchCellView::GetClassName() const {
void OmniboxMatchCellView::Layout() {
// Update the margins.
gfx::Insets insets = GetMarginInsets(
content()->GetLineHeight(),
is_rich_suggestion_ || should_show_tab_match_ || is_old_style_answer_);
gfx::Insets insets =
GetMarginInsets(content()->GetLineHeight(),
layout_style_ != LayoutStyle::ONE_LINE_SUGGESTION);
SetBorder(views::CreateEmptyBorder(insets.top(), insets.left(),
insets.bottom(), insets.right()));
// Layout children *after* updating the margins.
......@@ -353,13 +360,17 @@ void OmniboxMatchCellView::Layout() {
const int icon_view_width = kImageBoxSize;
const int text_indent = GetTextIndent();
if (is_rich_suggestion_ || should_show_tab_match_) {
LayoutNewStyleTwoLineSuggestion();
} else if (is_old_style_answer_) {
LayoutOldStyleAnswer(icon_view_width, text_indent);
} else {
LayoutOneLineSuggestion(icon_view_width,
text_indent + tail_suggest_common_prefix_width_);
switch (layout_style_) {
case LayoutStyle::OLD_ANSWER:
LayoutOldStyleAnswer(icon_view_width, text_indent);
break;
case LayoutStyle::ONE_LINE_SUGGESTION:
LayoutOneLineSuggestion(icon_view_width,
text_indent + tail_suggest_common_prefix_width_);
break;
case LayoutStyle::TWO_LINE_SUGGESTION:
LayoutNewStyleTwoLineSuggestion();
break;
}
}
......
chrome/browser/ui/views/omnibox/omnibox_match_cell_view.h
View file @ 531370c7
......@@ -39,6 +39,12 @@ class OmniboxMatchCellView : public views::View {
bool CanProcessEventsWithinSubtree() const override;
protected:
enum class LayoutStyle {
OLD_ANSWER,
ONE_LINE_SUGGESTION,
TWO_LINE_SUGGESTION,
};
// views::View:
void Layout() override;
const char* GetClassName() const override;
......@@ -47,10 +53,9 @@ class OmniboxMatchCellView : public views::View {
void LayoutNewStyleTwoLineSuggestion();
void LayoutOneLineSuggestion(int icon_view_width, int text_indent);
bool is_old_style_answer_;
bool is_rich_suggestion_;
bool is_search_type_;
bool should_show_tab_match_ = false;
bool is_rich_suggestion_ = false;
bool is_search_type_ = false;
LayoutStyle layout_style_ = LayoutStyle::ONE_LINE_SUGGESTION;
// Weak pointers for easy reference.
// An icon representing the type or content.
......
chrome/browser/ui/views/omnibox/omnibox_result_view.cc
View file @ 531370c7
......@@ -155,9 +155,10 @@ void OmniboxResultView::Invalidate() {
suggestion_view_->description()->SetText(match_.answer->second_line(),
true);
}
} else if (match_.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY) {
} else if (match_.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY ||
match_.type == AutocompleteMatchType::PEDAL) {
// Entities use match text and calculated classifications, but with style
// adjustments like answers above.
// adjustments like answers above. Pedals do likewise.
suggestion_view_->content()->SetText(match_.contents,
match_.contents_class);
suggestion_view_->description()->SetText(match_.description,
......
components/omnibox/browser/autocomplete_match.cc
View file @ 531370c7
......@@ -687,10 +687,11 @@ void AutocompleteMatch::ApplyPedal() {
// Note: Always use empty classifications for empty text and non-empty
// classifications for non-empty text.
contents = pedal->GetLabelStrings().suggestion_contents;
const auto& labels = pedal->GetLabelStrings();
contents = labels.suggestion_contents;
contents_class = {ACMatchClassification(0, ACMatchClassification::NONE)};
description.clear();
description_class.clear();
description = labels.hint;
description_class = {ACMatchClassification(0, ACMatchClassification::NONE)};
}
void AutocompleteMatch::RecordAdditionalInfo(const std::string& property,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment