[Chrome OS MD] Draw a 1px separator between 2 tray items

ash/common/system/tray/tray_background_view.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 "ash/common/system/tray/tray_background_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 11 matching lines @@
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/nine_image_painter.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace {
 
 const int kAnimationDurationForPopupMs = 200;
 
@@ skipping 60 matching lines @@
         ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
       background_color = SkColorSetA(kShelfBaseColor,
                                      GetShelfConstant(SHELF_BACKGROUND_ALPHA));
     }
 
     // TODO(bruthig|tdanderson): The background should be changed using a
     // fade in/out animation.
     SkPaint background_paint;
     background_paint.setFlags(SkPaint::kAntiAlias_Flag);
     background_paint.setColor(background_color);
-    canvas->DrawRoundRect(view->GetLocalBounds(), kTrayRoundedBorderRadius,
+    canvas->DrawRoundRect(view->GetContentsBounds(), kTrayRoundedBorderRadius,
                           background_paint);
 
     if (tray_background_view_->draw_background_as_active()) {
       SkPaint highlight_paint;
       highlight_paint.setFlags(SkPaint::kAntiAlias_Flag);
       highlight_paint.setColor(kShelfButtonActivatedHighlightColor);
-      canvas->DrawRoundRect(view->GetLocalBounds(), kTrayRoundedBorderRadius,
+      canvas->DrawRoundRect(view->GetContentsBounds(), kTrayRoundedBorderRadius,
                             highlight_paint);
     }
   }
 
   void PaintNonMaterial(gfx::Canvas* canvas, views::View* view) const {
     const int kGridSizeForPainter = 9;
     const int kImages[kNumOrientations][kNumStates][kGridSizeForPainter] = {
         {
             // Horizontal
             IMAGE_GRID_HORIZONTAL(IDR_AURA_TRAY_BG_HORIZ),
@@ skipping 71 matching lines @@
     PreferredSizeChanged();
 }
 
 void TrayBackgroundView::TrayContainer::UpdateLayout() {
   // Adjust the size of status tray dark background by adding additional
   // empty border.
   views::BoxLayout::Orientation orientation =
       IsHorizontalAlignment(alignment_) ? views::BoxLayout::kHorizontal
                                         : views::BoxLayout::kVertical;
 
-  if (!ash::MaterialDesignController::IsShelfMaterial()) {
-    // Additional padding used to adjust the user-visible size of status tray
-    // dark background.
-    const int padding = 3;
-    SetBorder(
-        views::Border::CreateEmptyBorder(padding, padding, padding, padding));
-  }
-
   views::BoxLayout* layout = new views::BoxLayout(orientation, 0, 0, 0);
   layout->SetDefaultFlex(1);
   views::View::SetLayoutManager(layout);
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayBackgroundView
 
 TrayBackgroundView::TrayBackgroundView(WmShelf* wm_shelf)
     : wm_shelf_(wm_shelf),
       tray_container_(NULL),
       shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
       background_(NULL),
       draw_background_as_active_(false),
       widget_observer_(new TrayWidgetObserver(this)) {
   DCHECK(wm_shelf_);
   set_notify_enter_exit_on_child(true);
 
   tray_container_ = new TrayContainer(shelf_alignment_);
   SetContents(tray_container_);
   tray_event_filter_.reset(new TrayEventFilter);
 
   SetPaintToLayer(true);
   layer()->SetFillsBoundsOpaquely(false);
   // Start the tray items not visible, because visibility changes are animated.
   views::View::SetVisible(false);
+  CalculateAndSetTrayContainerBorder();
 }
 
 TrayBackgroundView::~TrayBackgroundView() {
   if (GetWidget())
     GetWidget()->RemoveObserver(widget_observer_.get());
   StopObservingImplicitAnimations();
 }
 
 void TrayBackgroundView::Initialize() {
   GetWidget()->AddObserver(widget_observer_.get());
@@ skipping 114 matching lines @@
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(contents);
 }
 void TrayBackgroundView::SetContentsBackground() {
   background_ = new TrayBackground(this);
   tray_container_->set_background(background_);
 }
 
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
+  CalculateAndSetTrayContainerBorder();
   tray_container_->SetAlignment(alignment);
 }
 
+void TrayBackgroundView::CalculateAndSetTrayContainerBorder() {
+  if (!MaterialDesignController::IsShelfMaterial()) {
+    tray_container()->SetBorder(views::Border::NullBorder());
+    return;
+  } else {

[varkha, 2016/07/14 21:34:48]

nit: no need for 'else' with early return above.

[yiyix, 2016/07/26 20:27:31]

Done.

+    if (IsHorizontalAlignment(shelf()->GetAlignment())) {
+      // Extend hit region horizontally when horizontally aligned.
+      tray_container()->SetBorder(views::Border::CreateEmptyBorder(gfx::Insets(
+          0, kHitRegionPadding, 0, kHitRegionPadding + kSeparatorWidth)));
+    } else {
+      // Extend hit region vertically when vertically aligned.
+      tray_container()->SetBorder(views::Border::CreateEmptyBorder(gfx::Insets(
+          kHitRegionPadding, 0, kHitRegionPadding + kSeparatorWidth, 0)));
+    }
+  }
+}
+
 void TrayBackgroundView::OnImplicitAnimationsCompleted() {
   // If there is another animation in the queue, the reverse animation was
   // triggered before the completion of animating to invisible. Do not turn off
   // the visibility so that the next animation may render. The value of
   // layer()->GetTargetVisibility() can be incorrect if the hide animation was
   // aborted to schedule an animation to become visible. As the new animation
   // is not yet added to the queue. crbug.com/374236
   if (layer()->GetAnimator()->is_animating() || layer()->GetTargetVisibility())
     return;
   views::View::SetVisible(false);
@@ skipping 110 matching lines @@
   if (!background_)
     return;
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
+void TrayBackgroundView::DrawSeparator(gfx::Canvas* canvas) {
+  if (!(shelf()->GetBackgroundType() ==
+        ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) &&
+      MaterialDesignController::IsShelfMaterial()) {

[varkha, 2016/07/14 21:34:47]

How about

if (!MaterialDesignController::IsShelfMaterial() ||
    shelf()->GetBackgroundType() ==
ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
  return;
}

instead?

[yiyix, 2016/07/26 20:27:31]

It is better for readers to follow

+    const int x = GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY) + kHitRegionPadding +
+                  kHitRegionPadding;
+    const int y = (GetShelfConstant(SHELF_SIZE) -
+                   GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY)) /
+                  2;
+    const int width = kSeparatorWidth;
+    const int height = GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY);

[varkha, 2016/07/14 21:34:47]

If you move this up you can use |height| instead of calling
GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY).
I would move both width and height above together.

[yiyix, 2016/07/26 20:27:31]

Done.

+    const float scale = canvas->UndoDeviceScaleFactor();
+    SkPaint paint;
+    paint.setColor(kSeparatorColor);
+    paint.setAntiAlias(true);
+    const bool horizontal_shelf =
+        IsHorizontalAlignment(shelf()->GetAlignment());
+    gfx::Rect bounds = horizontal_shelf ? gfx::Rect(x, y, width, height)

[varkha, 2016/07/14 21:34:47]

nit: const.

[yiyix, 2016/07/26 20:27:31]

Done.

+                                        : gfx::Rect(y, x, height, width);
+    gfx::ScopedCanvas scoped_canvas(canvas);
+    gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale));
+    canvas->DrawLine(horizontal_shelf ? rect.top_right() : rect.bottom_left(),
+                     rect.bottom_right(), paint);
+  }
+}
+
 }  // namespace ash