Activate Views TabbedPane tabs on mouse pressed.

ui/views/controls/tabbed_pane/tabbed_pane.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/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
@@ skipping 25 matching lines @@
   Tab(TabbedPane* tabbed_pane, const string16& title, View* contents);
   virtual ~Tab();
 
   View* contents() const { return contents_; }
 
   bool selected() const { return contents_->visible(); }
   void SetSelected(bool selected);
 
   // Overridden from View:
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
-  virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
-  virtual void OnMouseCaptureLost() OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
 
  private:
   enum TabState {
     TAB_INACTIVE,
     TAB_ACTIVE,
-    TAB_PRESSED,
     TAB_HOVERED,
   };
 
   void SetState(TabState tab_state);
 
   TabbedPane* tabbed_pane_;
   Label* title_;
   gfx::Size preferred_title_size_;
   TabState tab_state_;
   // The content view associated with this tab.
@@ skipping 32 matching lines @@
 }
 
 Tab::~Tab() {}
 
 void Tab::SetSelected(bool selected) {
   contents_->SetVisible(selected);
   SetState(selected ? TAB_ACTIVE : TAB_INACTIVE);
 }
 
 bool Tab::OnMousePressed(const ui::MouseEvent& event) {
-  SetState(TAB_PRESSED);
+  if (GetLocalBounds().Contains(event.location()))

[sky, 2013/11/12 17:03:01]

Only on left mouse button?

[msw, 2013/11/12 18:48:51]

Done.

+    tabbed_pane_->SelectTab(this);
   return true;
 }
 
-void Tab::OnMouseReleased(const ui::MouseEvent& event) {
-  SetState(selected() ? TAB_ACTIVE : TAB_HOVERED);
-  if (GetLocalBounds().Contains(event.location()))
-    tabbed_pane_->SelectTab(this);
-}
-
-void Tab::OnMouseCaptureLost() {
-  SetState(TAB_INACTIVE);
-}
-
 void Tab::OnMouseEntered(const ui::MouseEvent& event) {
   SetState(selected() ? TAB_ACTIVE : TAB_HOVERED);
 }
 
 void Tab::OnMouseExited(const ui::MouseEvent& event) {
   SetState(selected() ? TAB_ACTIVE : TAB_INACTIVE);
 }
 
 void Tab::OnGestureEvent(ui::GestureEvent* event) {
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
-      SetState(TAB_PRESSED);
-      break;
+      // Fallthrough.
     case ui::ET_GESTURE_TAP:
       // SelectTab also sets the right tab color.
       tabbed_pane_->SelectTab(this);
       break;
     case ui::ET_GESTURE_TAP_CANCEL:
       SetState(selected() ? TAB_ACTIVE : TAB_INACTIVE);
       break;
     default:
       break;
   }
@@ skipping 23 matching lines @@
 
   switch (tab_state) {
     case TAB_INACTIVE:
       title_->SetEnabledColor(kTabTitleColor_Inactive);
       title_->SetFont(gfx::Font());
       break;
     case TAB_ACTIVE:
       title_->SetEnabledColor(kTabTitleColor_Active);
       title_->SetFont(gfx::Font().DeriveFont(0, gfx::Font::BOLD));
       break;
-    case TAB_PRESSED:
-      // No visual distinction for pressed state.
-      break;
     case TAB_HOVERED:
       title_->SetEnabledColor(kTabTitleColor_Hovered);
       title_->SetFont(gfx::Font());
       break;
   }
   SchedulePaint();
 }
 
 TabStrip::TabStrip(TabbedPane* tabbed_pane) : tabbed_pane_(tabbed_pane) {}
 
@@ skipping 190 matching lines @@
     selected_tab->NotifyAccessibilityEvent(
         ui::AccessibilityTypes::EVENT_FOCUS, true);
   }
 }
 
 void TabbedPane::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
 }
 
 }  // namespace views