Prevent title-only panel from fully minimizing when attention is cleared if mouse is in the panel o…

chrome/browser/ui/panels/docked_panel_strip.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 "chrome/browser/ui/panels/docked_panel_strip.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 // Width to height ratio is used to compute the default width or height
 // when only one value is provided.
 const double kPanelDefaultWidthToHeightRatio = 1.62;  // golden ratio
@@ skipping 438 matching lines @@
       NOTREACHED();
       break;
   }
 
   int bottom = GetBottomPositionForExpansionState(expansion_state);
   bounds->set_y(bottom - bounds->height());
 }
 
 void DockedPanelStrip::OnPanelAttentionStateChanged(Panel* panel) {
   DCHECK_EQ(this, panel->panel_strip());
+  Panel::ExpansionState state = panel->expansion_state();
   if (panel->IsDrawingAttention()) {
     // Bring up the titlebar to get user's attention.
-    if (panel->expansion_state() == Panel::MINIMIZED)
+    if (state == Panel::MINIMIZED)
       panel->SetExpansionState(Panel::TITLE_ONLY);
-  } else {
-    // Maybe bring down the titlebar now that panel is not drawing attention.
-    if (panel->expansion_state() == Panel::TITLE_ONLY && !are_titlebars_up_)
-      panel->SetExpansionState(Panel::MINIMIZED);
+    return;
   }
+
+  // Maybe bring down the titlebar now that panel is not drawing attention.

[jianli, 2012/05/16 18:37:41]

nit: This comment does not apply to the check below.

+  if (state != Panel::TITLE_ONLY || are_titlebars_up_)
+    return;
+
+  // Leave titlebar up when dragging a panel.

[jianli, 2012/05/16 18:37:41]

nit: Indeed we mean that this panel is being dragged, not any panel is being
dragged.

+  if (dragging_panel_current_iterator_ != panels_.end() &&
+      *dragging_panel_current_iterator_ == panel)
+    return;
+
+  // Leave titlebar up if mouse is in/below the panel.
+  const gfx::Point mouse_position =
+      panel_manager_->mouse_watcher()->GetMousePosition();
+  gfx::Rect bounds = panel->GetBounds();
+  if (bounds.x() <= mouse_position.x() &&
+      mouse_position.x() <= bounds.right() &&
+      mouse_position.y() >= bounds.y())
+    return;
+
+  panel->SetExpansionState(Panel::MINIMIZED);
 }
 
 void DockedPanelStrip::OnPanelTitlebarClicked(Panel* panel,
                                               panel::ClickModifier modifier) {
   DCHECK_EQ(this, panel->panel_strip());
   if (!IsPanelMinimized(panel))
     return;
 
   if (modifier == panel::APPLY_TO_ALL)
     RestoreAll();
@@ skipping 137 matching lines @@
 
     gfx::Rect bounds = panel->GetBounds();
     if (bounds.x() <= mouse_x && mouse_x <= bounds.right() &&
         mouse_y >= bounds.y())
       return true;
   }
   return false;
 }
 
 void DockedPanelStrip::BringUpOrDownTitlebars(bool bring_up) {
-  if (are_titlebars_up_ == bring_up)
-    return;
   are_titlebars_up_ = bring_up;
-
   int task_delay_ms = 0;
 
   // If the auto-hiding bottom bar exists, delay the action until the bottom
   // bar is fully visible or hidden. We do not want both bottom bar and panel
   // titlebar to move at the same time but with different speeds.
   DisplaySettingsProvider* provider =
       panel_manager_->display_settings_provider();
   if (provider->IsAutoHidingDesktopBarEnabled(
           DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_BOTTOM)) {
     DisplaySettingsProvider::DesktopBarVisibility visibility =
@@ skipping 253 matching lines @@
 void DockedPanelStrip::OnPanelActiveStateChanged(Panel* panel) {
   // Refresh layout, but wait till active states settle.
   // This lets us avoid refreshing too many times when one panel loses
   // focus and another gains it.
   ScheduleLayoutRefresh();
 }
 
 bool DockedPanelStrip::HasPanel(Panel* panel) const {
   return find(panels_.begin(), panels_.end(), panel) != panels_.end();
 }