Commit 711a00d3 authored by Thomas Anderson's avatar Thomas Anderson Committed by Commit Bot

Revert "[GTK] Fix menu background color regression"

This reverts commit c551571f.

Reason for revert: Need to revert a dependent CL (https://chromium-review.googlesource.com/c/chromium/src/+/1229173), so reverting this to prevent merge conflicts

Original change's description:
> [GTK] Fix menu background color regression
>
> Regressed after 9c5131ad.  This caused the menu
> background to always render white even though the text colors would still be
> styled using the system theme.  This caused illegible text when the menu
> background was supposed to be dark.
>
> R=​pkasting
> TBR=sky
>
> Change-Id: I39b836e0941cbfc033515fe3891ecd42d89d73a4
> Reviewed-on: https://chromium-review.googlesource.com/1237519
> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Peter Kasting <pkasting@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#593039}

TBR=sky@chromium.org,pkasting@chromium.org,thomasanderson@chromium.org
NOTRY=true
NOPRESUBMIT=true

Change-Id: If1fa983c97f0942cea3fccad14372ed1f5922080
Reviewed-on: https://chromium-review.googlesource.com/1240713
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593649}
parent 134fcfe7
...@@ -188,7 +188,10 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) ...@@ -188,7 +188,10 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
arrow_ = BubbleBorderTypeFromAnchor( arrow_ = BubbleBorderTypeFromAnchor(
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition()); content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
CreateBorder(); if (HasBubbleBorder())
CreateBubbleBorder();
else
CreateDefaultBorder();
} }
bool MenuScrollViewContainer::HasBubbleBorder() { bool MenuScrollViewContainer::HasBubbleBorder() {
...@@ -236,7 +239,8 @@ void MenuScrollViewContainer::Layout() { ...@@ -236,7 +239,8 @@ void MenuScrollViewContainer::Layout() {
void MenuScrollViewContainer::OnNativeThemeChanged( void MenuScrollViewContainer::OnNativeThemeChanged(
const ui::NativeTheme* theme) { const ui::NativeTheme* theme) {
CreateBorder(); if (!HasBubbleBorder())
CreateDefaultBorder();
} }
void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) { void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
...@@ -268,13 +272,6 @@ void MenuScrollViewContainer::OnBoundsChanged( ...@@ -268,13 +272,6 @@ void MenuScrollViewContainer::OnBoundsChanged(
Layout(); Layout();
} }
void MenuScrollViewContainer::CreateBorder() {
if (HasBubbleBorder())
CreateBubbleBorder();
else
CreateDefaultBorder();
}
void MenuScrollViewContainer::CreateDefaultBorder() { void MenuScrollViewContainer::CreateDefaultBorder() {
DCHECK_EQ(arrow_, BubbleBorder::NONE); DCHECK_EQ(arrow_, BubbleBorder::NONE);
bubble_border_ = nullptr; bubble_border_ = nullptr;
...@@ -313,9 +310,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() { ...@@ -313,9 +310,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
void MenuScrollViewContainer::CreateBubbleBorder() { void MenuScrollViewContainer::CreateBubbleBorder() {
bubble_border_ = bubble_border_ =
new BubbleBorder(arrow_, BubbleBorder::SMALL_SHADOW, new BubbleBorder(arrow_, BubbleBorder::SMALL_SHADOW, SK_ColorWHITE);
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_MenuBackgroundColor));
MenuController* controller = MenuController* controller =
content_view_->GetMenuItem()->GetMenuController(); content_view_->GetMenuItem()->GetMenuController();
if (MD::IsRefreshUi() || controller->use_touchable_layout()) { if (MD::IsRefreshUi() || controller->use_touchable_layout()) {
......
...@@ -44,9 +44,6 @@ class VIEWS_EXPORT MenuScrollViewContainer : public View { ...@@ -44,9 +44,6 @@ class VIEWS_EXPORT MenuScrollViewContainer : public View {
void OnBoundsChanged(const gfx::Rect& previous_bounds) override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
private: private:
// Creates the appropriate default or bubble border.
void CreateBorder();
// Create the default border. // Create the default border.
void CreateDefaultBorder(); void CreateDefaultBorder();
......
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