Adds arrow icon and updates exit label color for touch calibration

chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc

 // Copyright 2016 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 "chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
@@ skipping 13 matching lines @@
 
 namespace {
 
 constexpr char kWidgetName[] = "TouchCalibratorOverlay";
 
 constexpr int kAnimationFrameRate = 100;
 constexpr int kFadeDurationInMs = 150;
 constexpr int kPointMoveDurationInMs = 400;
 constexpr int kPointMoveDurationLongInMs = 500;
 
-const SkColor kExitLabelColor = SkColorSetARGBInline(255, 96, 96, 96);
+const SkColor kExitLabelColor = SkColorSetARGBInline(255, 138, 138, 138);
 constexpr int kExitLabelWidth = 300;
 constexpr int kExitLabelHeight = 20;
 
 const SkColor kTapHereLabelColor = SK_ColorWHITE;
 
 constexpr int kHintBoxWidth = 298;
 constexpr int kHintBoxHeight = 180;
+constexpr int kHintBoxArrowWidth = 8;
+constexpr int kHintBoxArrowHeight = 14;
 constexpr int kHintBoxLabelTextSize = 5;
 constexpr int kHintBoxSublabelTextSize = 3;
 
 constexpr int kThrobberCircleViewWidth = 64;
 constexpr float kThrobberCircleRadiusFactor = 3.f / 8.f;
 
 constexpr int kFinalMessageTransitionDurationMs = 200;
 constexpr int kCompleteMessageViewWidth = 427;
 constexpr int kCompleteMessageViewHeight = kThrobberCircleViewWidth;
 constexpr int kCompleteMessageTextSize = 16;
@@ skipping 219 matching lines @@
   HintBox(const gfx::Rect& bounds, int border_radius);
   ~HintBox() override;
 
   // views::View overrides:
   void OnPaint(gfx::Canvas* canvas) override;
 
   void SetLabel(const base::string16& text, const SkColor& color);
   void SetSubLabel(const base::string16& text, const SkColor& color);
 
  private:
+  void UpdateWidth(int updated_width);
+  void UpdateTriangle();
+
   base::string16 label_text_;
   base::string16 sublabel_text_;
 
   SkColor label_color_;
   SkColor sublabel_color_;
 
   const int border_radius_;
 
   int horizontal_offset_;
 
+  gfx::Rect rounded_rect_bounds_;
+
   gfx::FontList label_font_list_;
   gfx::FontList sublabel_font_list_;
 
   gfx::Rect label_text_bounds_;
   gfx::Rect sublabel_text_bounds_;
 
   SkPaint paint_;
 
+  SkPath triangle_path_;
+
   DISALLOW_COPY_AND_ASSIGN(HintBox);
 };
 
 HintBox::HintBox(const gfx::Rect& bounds, int border_radius)
-    : border_radius_(border_radius) {
+    : border_radius_(border_radius),
+      rounded_rect_bounds_(
+          gfx::Rect(base::i18n::IsRTL() ? 0 : kHintBoxArrowWidth,
+                    0,
+                    bounds.width() - kHintBoxArrowWidth,
+                    bounds.height())) {

[oshima, 2017/01/25 22:08:54]

can you use GetMirroredxxx api on views?

[malaykeshav, 2017/01/25 23:54:22]

Done

   SetBoundsRect(bounds);
 
   paint_.setColor(SK_ColorWHITE);
   paint_.setStyle(SkPaint::kFill_Style);
   paint_.setFlags(SkPaint::kAntiAlias_Flag);
 
-  horizontal_offset_ = width() * 0.08f;
+  horizontal_offset_ =
+      kHintBoxArrowWidth + rounded_rect_bounds_.width() * 0.08f;
   int top_offset = horizontal_offset_;
   int line_gap = height() * 0.018f;
   int label_height = height() * 0.11f;
 
   label_text_bounds_.SetRect(horizontal_offset_, top_offset, 0, label_height);
 
   top_offset += label_text_bounds_.height() + line_gap;
 
   sublabel_text_bounds_.SetRect(horizontal_offset_, top_offset, 0,
                                 label_height);
+
+  UpdateTriangle();
 }
 
 HintBox::~HintBox() {}
 
+void HintBox::UpdateTriangle() {
+  const int kHorizontalOffset = base::i18n::IsRTL() ? width() : 0;
+  const int kMultiplier = base::i18n::IsRTL() ? 1 : -1;

[oshima, 2017/01/25 22:08:54]

ditto

[malaykeshav, 2017/01/25 23:54:22]

Done

+
+  triangle_path_.reset();
+  triangle_path_.moveTo(kHorizontalOffset, SkIntToScalar(height() / 2));
+  triangle_path_.lineTo(
+      SkIntToScalar((kHorizontalOffset - kHintBoxArrowWidth) * kMultiplier),
+      SkIntToScalar((height() - kHintBoxArrowHeight) / 2));
+
+  triangle_path_.lineTo(
+      SkIntToScalar((kHorizontalOffset - kHintBoxArrowWidth) * kMultiplier),
+      SkIntToScalar((height() + kHintBoxArrowHeight) / 2));
+  triangle_path_.close();
+}
+
+void HintBox::UpdateWidth(int updated_width) {
+  rounded_rect_bounds_.set_size(gfx::Size(updated_width, height()));
+  SetSize(
+      gfx::Size(rounded_rect_bounds_.width() + kHintBoxArrowWidth, height()));
+
+  UpdateTriangle();
+}
+
 void HintBox::SetLabel(const base::string16& text, const SkColor& color) {
   label_text_ = text;
   label_color_ = color;
 
   label_font_list_ =
       ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
           kHintBoxLabelTextSize, gfx::Font::FontStyle::NORMAL,
           gfx::Font::Weight::NORMAL);
 
   // Adjust size of label bounds based on text and font.
   gfx::Size size = GetSizeForString(label_text_, label_font_list_);
   label_text_bounds_.set_size(
       gfx::Size(size.width(), label_text_bounds_.height()));
 
   // Check if the width of hint box needs to be updated.
   int minimum_expected_width = size.width() + 2 * horizontal_offset_;
-  if (minimum_expected_width > width())
-    SetSize(gfx::Size(minimum_expected_width, height()));
+  if (minimum_expected_width > rounded_rect_bounds_.width())
+    UpdateWidth(minimum_expected_width);
 }
 
 void HintBox::SetSubLabel(const base::string16& text, const SkColor& color) {
   sublabel_text_ = text;
   sublabel_color_ = color;
 
   sublabel_font_list_ =
       ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
           kHintBoxSublabelTextSize, gfx::Font::FontStyle::NORMAL,
           gfx::Font::Weight::NORMAL);
 
   // Adjust size of sublabel label bounds based on text and font.
   gfx::Size size = GetSizeForString(sublabel_text_, sublabel_font_list_);
   sublabel_text_bounds_.set_size(
       gfx::Size(size.width(), sublabel_text_bounds_.height()));
 
   // Check if the width of hint box needs to be updated.
   int minimum_expected_width = size.width() + 2 * horizontal_offset_;
-  if (minimum_expected_width > width())
-    SetSize(gfx::Size(minimum_expected_width, height()));
+  if (minimum_expected_width > rounded_rect_bounds_.width())
+    UpdateWidth(minimum_expected_width);
 }
 
 void HintBox::OnPaint(gfx::Canvas* canvas) {
-  canvas->DrawRoundRect(GetLocalBounds(), border_radius_, paint_);
+  canvas->DrawPath(triangle_path_, paint_);
+  canvas->DrawRoundRect(rounded_rect_bounds_, border_radius_, paint_);
   canvas->DrawStringRectWithFlags(label_text_, label_font_list_, label_color_,
                                   label_text_bounds_, gfx::Canvas::NO_ELLIPSIS);
   canvas->DrawStringRectWithFlags(sublabel_text_, sublabel_font_list_,
                                   sublabel_color_, sublabel_text_bounds_,
                                   gfx::Canvas::NO_ELLIPSIS);
 }
 
 class CompletionMessageView : public views::View {
  public:
   CompletionMessageView(const gfx::Rect& bounds, const base::string16& message);
@@ skipping 150 matching lines @@
   AddChildView(touch_point_view_);
 
   // Initialize the Hint Box view.
   base::string16 hint_label_text =
       rb.GetLocalizedString(IDS_DISPLAY_TOUCH_CALIBRATION_HINT_LABEL_TEXT);
   base::string16 hint_sublabel_text =
       rb.GetLocalizedString(IDS_DISPLAY_TOUCH_CALIBRATION_HINT_SUBLABEL_TEXT);
 
   int tpv_width = touch_point_view_->width();
 
-  gfx::Size size(kHintBoxWidth, kHintBoxHeight);
+  gfx::Size size(kHintBoxWidth + kHintBoxArrowWidth, kHintBoxHeight);
 
-  gfx::Point position(
-      touch_point_view_->x() + tpv_width * 1.2f,
-      touch_point_view_->y() + (tpv_width / 2.f) - (size.height() / 2.f));
+  gfx::Point position(touch_point_view_->x() + tpv_width * 1.2f,
+                      touch_point_view_->y() +
+                          (kThrobberCircleViewWidth / 2.f) -
+                          (size.height() / 2.f));
 
   HintBox* hint_box =
       new HintBox(gfx::Rect(position, size), kHintRectBorderRadius);
   hint_box->SetVisible(false);
   hint_box->SetLabel(hint_label_text, kHintLabelTextColor);
   hint_box->SetSubLabel(hint_sublabel_text, kHintSublabelTextColor);
   hint_box_view_ = hint_box;
 
   AddChildView(hint_box_view_);
 
   // Initialize the animated hint box throbber view.
   TouchTargetThrobberView* target_view = new TouchTargetThrobberView(
-      gfx::Rect((size.width() - kTouchTargetWidth) / 2,
+      gfx::Rect((kHintBoxArrowWidth + size.width() - kTouchTargetWidth) / 2,
                 size.height() * kTouchTargetVerticalOffsetFactor,
                 kTouchTargetWidth, kTouchTargetHeight),
       kTouchTargetInnerCircleColor, kTouchTargetOuterCircleColor,
       kHandIconColor, kCircleAnimationDurationMs);
   target_view->SetVisible(true);
 
   hint_box_view_->AddChildView(target_view);
 
   // Initialize the view that contains the calibration complete message which
   // will be displayed at the end.
@@ skipping 222 matching lines @@
 void TouchCalibratorView::SkipCurrentAnimation() {
   if (animator_->is_animating())
     animator_->End();
   if (touch_point_view_ &&
       touch_point_view_->layer()->GetAnimator()->is_animating()) {
     touch_point_view_->layer()->GetAnimator()->StopAnimating();
   }
 }
 
 }  // namespace chromeos