MacViews: draw combobox arrow backgrounds

ui/views/controls/combobox/combobox.cc

 // 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/combobox/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 607 matching lines @@
   if (e.key_code() == ui::VKEY_SPACE && style_ == STYLE_ACTION)
     OnPerformAction();
 
   return false;
 }
 
 void Combobox::OnPaint(gfx::Canvas* canvas) {
   switch (style_) {
     case STYLE_NORMAL: {
       OnPaintBackground(canvas);
+      // Painting the arrow background needs to happen before PaintText applies
+      // a clip rect to |canvas| so the background can touch the border.
+      PaintArrowBackground(canvas);
       PaintText(canvas);
       OnPaintBorder(canvas);
       break;
     }
     case STYLE_ACTION: {
       PaintButtons(canvas);
       PaintText(canvas);
       break;
     }
   }
@@ skipping 68 matching lines @@
   gfx::Insets insets = GetInsets();
   insets += gfx::Insets(0, Textfield::kTextPadding, 0, Textfield::kTextPadding);
 
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
   SkColor text_color = GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_LabelEnabledColor);
+      enabled() ? ui::NativeTheme::kColorId_LabelEnabledColor :
+                  ui::NativeTheme::kColorId_LabelDisabledColor);
 
   DCHECK_GE(selected_index_, 0);
   DCHECK_LT(selected_index_, model()->GetItemCount());
   if (selected_index_ < 0 || selected_index_ > model()->GetItemCount())
     selected_index_ = 0;
   base::string16 text = model()->GetItemAt(selected_index_);
 
   gfx::Size arrow_size = ArrowSize();
   int disclosure_arrow_offset = width() - arrow_size.width() -
       GetDisclosureArrowLeftPadding() - GetDisclosureArrowRightPadding();
@@ skipping 79 matching lines @@
   if (0 < arrow_button_hover_alpha) {
     canvas->SaveLayerAlpha(arrow_button_hover_alpha);
     const std::vector<const gfx::ImageSkia*>& arrow_button_hovered_images =
         menu_button_images_[focused][Button::STATE_HOVERED];
     PaintArrowButton(canvas, arrow_button_hovered_images,
                      arrow_button_->x(), height());
     canvas->Restore();
   }
 }
 
+void Combobox::PaintArrowBackground(gfx::Canvas* canvas) {
+  gfx::ScopedCanvas scoped_canvas(canvas);

[tapted, 2016/03/22 11:20:26]

This is a lot of code for something Mac-specific - I think combobox doesn't have
a background set via View::set_background(..). A Background::Paint(..) override
really feels like the right place for this -- something created by PlatformStyle
(default implementation returns null).

Background::Paint(..) takes in a views::View* -- we can DCHECK
view->GetClassName() == Combobox::kViewClassName and cast it to get the arrow
size.

(also there's Background::CreateVerticalMultiColorGradientBackground but it
probably won't handle the corners)

Then, I'm uncertain where the line between the Background override and
NativeTheme should be. Since it's mac-specific and not actually reaching into
anything from the native OS, I think we should not modify NativeTheme.

I like GetButtonBackgroundShader though. I'm just not sure if it belongs on
NativeThemeMac or in platform_style_mac.h - let's ask sky

[Elly Fong-Jones, 2016/03/22 22:05:10]

Done.

+
+  if (base::i18n::IsRTL()) {
+    canvas->Translate(gfx::Vector2d(width(), 0));
+    canvas->Scale(-1, 1);
+  }
+
+  gfx::Rect bounds = GetLocalBounds();
+  gfx::Size arrow_size = ArrowSize();
+  int disclosure_arrow_offset = width() - arrow_size.width() -
+      GetDisclosureArrowLeftPadding() - GetDisclosureArrowRightPadding();
+  bounds.Inset(disclosure_arrow_offset, 0, 0, 0);
+
+  ui::NativeTheme::State state =
+      HasFocus() ? ui::NativeTheme::kHovered : ui::NativeTheme::kNormal;
+  GetNativeTheme()->Paint(canvas->sk_canvas(),
+                          ui::NativeTheme::kComboboxArrowBackground,
+                          state,
+                          bounds,
+                          ui::NativeTheme::ExtraParams());
+}
+
 void Combobox::ShowDropDownMenu(ui::MenuSourceType source_type) {
   gfx::Rect lb = GetLocalBounds();
   gfx::Point menu_position(lb.origin());
 
   if (style_ == STYLE_NORMAL) {
     // Inset the menu's requested position so the border of the menu lines up
     // with the border of the combobox.
     menu_position.set_x(menu_position.x() + kMenuBorderWidthLeft);
     menu_position.set_y(menu_position.y() + kMenuBorderWidthTop);
   }
@@ skipping 102 matching lines @@
   return gfx::Size(width, font_list.GetHeight());
 }
 
 PrefixSelector* Combobox::GetPrefixSelector() {
   if (!selector_)
     selector_.reset(new PrefixSelector(this));
   return selector_.get();
 }
 
 }  // namespace views