Introduces 'highlighted' property to candidate view.

ash/ime/candidate_view.cc

 // Copyright 2014 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/ime/candidate_view.h"
 
 #include "ash/ime/candidate_window_constants.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/candidate_window.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 122 matching lines @@
 }  // namespace
 
 CandidateView::CandidateView(
     views::ButtonListener* listener,
     ui::CandidateWindow::Orientation orientation)
     : views::CustomButton(listener),
       orientation_(orientation),
       shortcut_label_(NULL),
       candidate_label_(NULL),
       annotation_label_(NULL),
-      infolist_icon_(NULL) {
+      infolist_icon_(NULL),
+      shortcut_width_(0),
+      candidate_width_(0),
+      highlighted_(false) {
   SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
 
   const ui::NativeTheme& theme = *GetNativeTheme();
   shortcut_label_ = CreateShortcutLabel(orientation, theme);
   candidate_label_ = CreateCandidateLabel(orientation);
   annotation_label_ = CreateAnnotationLabel(orientation, theme);
 
   AddChildView(shortcut_label_);
   AddChildView(candidate_label_);
   AddChildView(annotation_label_);
@@ skipping 27 matching lines @@
   candidate_label_->SetText(entry.value);
   annotation_label_->SetText(entry.annotation);
 }
 
 void CandidateView::SetInfolistIcon(bool enable) {
   if (infolist_icon_)
     infolist_icon_->SetVisible(enable);
   SchedulePaint();
 }
 
-void CandidateView::StateChanged() {
-  shortcut_label_->SetEnabled(state() != STATE_DISABLED);
-  if (state() == STATE_PRESSED) {
+void CandidateView::SetHighlighted(bool highlighted) {
+  if (highlighted_ == highlighted)
+    return;
+
+  highlighted_ = highlighted;
+  if (highlighted) {
     ui::NativeTheme* theme = GetNativeTheme();
     set_background(
         views::Background::CreateSolidBackground(theme->GetSystemColor(
             ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
     SetBorder(views::Border::CreateSolidBorder(
         1,
         theme->GetSystemColor(ui::NativeTheme::kColorId_FocusedBorderColor)));
 
     // Cancel currently focused one.
     for (int i = 0; i < parent()->child_count(); ++i) {
       CandidateView* view =
           static_cast<CandidateView*>((parent()->child_at(i)));
-      if (view != this && view->state() == STATE_PRESSED)
-        view->SetState(STATE_NORMAL);
+      if (view != this)
+        view->SetHighlighted(false);
     }
   } else {
     set_background(NULL);
     SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
   }
+  SchedulePaint();
+}
+
+void CandidateView::StateChanged() {
+  shortcut_label_->SetEnabled(state() != STATE_DISABLED);
+  if (state() == STATE_PRESSED)
+    SetHighlighted(true);

[oshima, 2014/04/23 23:50:07]

shouldn't this be 

SetHighlighted(state() == STATE_PRESSED)

?

[Jun Mukai, 2014/04/23 23:58:02]

No, state() can be changed to 'HOVER' and then 'NORMAL' for mouse hovering. We
don't want to set the existing highlight to false in that case.

[oshima, 2014/04/24 00:05:37]

Ah i see. Can you add test for this? It looks subtle and can be fragile to
changes.

[Jun Mukai, 2014/04/24 19:01:39]

Done.

 }
 
 bool CandidateView::OnMouseDragged(const ui::MouseEvent& event) {
   if (!HitTestPoint(event.location())) {
     // Moves the drag target to the sibling view.
     gfx::Point location_in_widget(event.location());
     ConvertPointToWidget(this, &location_in_widget);
     for (int i = 0; i < parent()->child_count(); ++i) {
-      views::View* sibling = parent()->child_at(i);
+      CandidateView* sibling =
+          static_cast<CandidateView*>(parent()->child_at(i));
       if (sibling == this)
         continue;
       gfx::Point location_in_sibling(location_in_widget);
       ConvertPointFromWidget(sibling, &location_in_sibling);
       if (sibling->HitTestPoint(location_in_sibling)) {
         GetWidget()->GetRootView()->SetMouseHandler(sibling);
-        return sibling->OnMouseDragged(event);
+        sibling->SetHighlighted(true);
+        return sibling->OnMouseDragged(ui::MouseEvent(event, this, sibling));
       }
     }
 
     return false;
   }
 
   return views::CustomButton::OnMouseDragged(event);
 }
 
 void CandidateView::Layout() {
@@ skipping 38 matching lines @@
   }
 
   // Reserves the margin for infolist_icon even if it's not visible.
   size.Enlarge(
       kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0);
   return size;
 }
 
 }  // namespace ime
 }  // namespace ash