Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4345)

Unified Diff: chrome/browser/ui/panels/docked_panel_strip.cc

Issue 9129013: Panel Overflow on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cr feedback Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/docked_panel_strip.cc
diff --git a/chrome/browser/ui/panels/docked_panel_strip.cc b/chrome/browser/ui/panels/docked_panel_strip.cc
index c59682dd5e8e59959b1b10dbadcffbc277695393..b47d27795e05441d37c215cd05421f21a2c8e0d1 100644
--- a/chrome/browser/ui/panels/docked_panel_strip.cc
+++ b/chrome/browser/ui/panels/docked_panel_strip.cc
@@ -140,7 +140,7 @@ void DockedPanelStrip::AddPanel(Panel* panel) {
// Panel is moved to overflow from the strip after a delay.
// TODO(jianli): remove the guard when overflow support is enabled on other
// platforms. http://crbug.com/105073
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
if (x < display_area_.x()) {
x = display_area_.x();
panel->set_has_temporary_layout(true);
@@ -157,6 +157,8 @@ void DockedPanelStrip::AddPanel(Panel* panel) {
panel->Initialize(gfx::Rect(x, y, width, height));
}
+ panel->ApplyVisualStyleForStrip(DOCKED_STRIP);
+
if (panel->has_temporary_layout())
panels_in_temporary_layout_.insert(panel);
else
@@ -653,7 +655,7 @@ void DockedPanelStrip::Rearrange() {
// TODO(jianli): remove the guard when overflow support is enabled on other
// platforms. http://crbug.com/105073
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
if (x < display_area_.x())
break;
#endif
@@ -669,7 +671,7 @@ void DockedPanelStrip::Rearrange() {
// TODO(jianli): remove the guard when overflow support is enabled on other
// platforms. http://crbug.com/105073
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
// Add/remove panels from/to overflow. A change in work area or the
// resize/removal of a panel may affect how many panels fit in the strip.
if (panel_index < panels_.size()) {
« no previous file with comments | « no previous file | chrome/browser/ui/panels/native_panel.h » ('j') | chrome/browser/ui/panels/panel_overflow_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698