OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/app_list/views/app_list_background.h" | 5 #include "ui/app_list/views/app_list_background.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "third_party/skia/include/core/SkPaint.h" | 8 #include "third_party/skia/include/core/SkPaint.h" |
9 #include "third_party/skia/include/core/SkPath.h" | 9 #include "third_party/skia/include/core/SkPath.h" |
10 #include "ui/app_list/app_list_constants.h" | 10 #include "ui/app_list/app_list_constants.h" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 paint.setColor(kContentsBackgroundColor); | 81 paint.setColor(kContentsBackgroundColor); |
82 canvas->DrawRect(contents_rect, paint); | 82 canvas->DrawRect(contents_rect, paint); |
83 | 83 |
84 if (app_list::switches::IsExperimentalAppListEnabled()) { | 84 if (app_list::switches::IsExperimentalAppListEnabled()) { |
85 if (main_view_->visible()) { | 85 if (main_view_->visible()) { |
86 views::View* contents_view = main_view_->contents_view(); | 86 views::View* contents_view = main_view_->contents_view(); |
87 const gfx::Rect contents_view_view_bounds = | 87 const gfx::Rect contents_view_view_bounds = |
88 contents_view->ConvertRectToWidget(contents_view->GetLocalBounds()); | 88 contents_view->ConvertRectToWidget(contents_view->GetLocalBounds()); |
89 gfx::Rect separator_rect(contents_rect); | 89 gfx::Rect separator_rect(contents_rect); |
| 90 separator_rect.Inset( |
| 91 kExperimentalWindowPadding + main_view_->GetInsets().left(), 0); |
90 separator_rect.set_y(contents_view_view_bounds.bottom()); | 92 separator_rect.set_y(contents_view_view_bounds.bottom()); |
91 separator_rect.set_height(kBottomSeparatorSize); | 93 separator_rect.set_height(kBottomSeparatorSize); |
92 canvas->FillRect(separator_rect, kBottomSeparatorColor); | 94 canvas->FillRect(separator_rect, kBottomSeparatorColor); |
93 int contents_switcher_top = separator_rect.bottom(); | |
94 gfx::Rect contents_switcher_rect(bounds.x(), | |
95 contents_switcher_top, | |
96 bounds.width(), | |
97 bounds.bottom() - contents_switcher_top); | |
98 paint.setColor(kContentsSwitcherBackgroundColor); | |
99 canvas->DrawRect(contents_switcher_rect, paint); | |
100 } | 95 } |
101 } | 96 } |
102 | 97 |
103 canvas->Restore(); | 98 canvas->Restore(); |
104 } | 99 } |
105 | 100 |
106 } // namespace app_list | 101 } // namespace app_list |
OLD | NEW |