Commit be2fbeca authored by Dana Fried's avatar Dana Fried Committed by Commit Bot

Revert "Fix spacing issue on hover cards."

This reverts commit f11b606d.

Reason for revert: Did not fix the problem completely. Will check in a universal fix.

Original change's description:
> Fix spacing issue on hover cards.
> 
> Issue was caused by a previous fix for CrOS not taking hover card images
> into account. Now there is a uniform margin around preview images, as
> there was before.
> 
> Also removed a redundant SetProperty call that was overridden later in
> the same function.
> 
> Bug: 1087759
> Change-Id: I5d1ab7081f9e1195961ead27cfc365bb6e25ede8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225239
> Reviewed-by: Connie Wan <connily@chromium.org>
> Commit-Queue: Connie Wan <connily@chromium.org>
> Commit-Queue: Dana Fried <dfried@chromium.org>
> Auto-Submit: Dana Fried <dfried@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#774326}

TBR=dfried@chromium.org,connily@chromium.org

Change-Id: Ia3fa918d758687df80be358c79803413ecc9869d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1087759
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2229320Reviewed-by: default avatarDana Fried <dfried@chromium.org>
Commit-Queue: Dana Fried <dfried@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774715}
parent eadc1678
......@@ -390,6 +390,10 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* tab)
title_label_->SetVerticalAlignment(gfx::ALIGN_TOP);
title_label_->SetMultiLine(true);
title_label_->SetMaxLines(kTitleMaxLines);
title_label_->SetProperty(
views::kFlexBehaviorKey,
views::FlexSpecification(views::MinimumFlexSizeRule::kPreferred,
views::MaximumFlexSizeRule::kPreferred, true));
title_fade_label_ = AddChildView(std::make_unique<FadeLabel>(
base::string16(), CONTEXT_TAB_HOVER_CARD_TITLE,
......@@ -441,11 +445,6 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* tab)
views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToMinimum,
views::MaximumFlexSizeRule::kPreferred));
domain_label_->SetVisible(tab->controller()->ShowDomainInHoverCard(tab));
if (preview_image_) {
// Always want a nonzero margin above the preview image if present.
preview_image_->SetProperty(
views::kMarginsKey, gfx::Insets(kVerticalMargin, kHorizontalMargin));
}
widget_ = views::BubbleDialogDelegateView::CreateBubble(this);
set_adjust_if_offscreen(true);
......
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