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

Side by Side Diff: ash/shelf/overflow_bubble_view.cc

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/shelf/overflow_bubble_view.h" 5 #include "ash/shelf/overflow_bubble_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shelf/shelf.h" 10 #include "ash/shelf/shelf.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 169 }
170 170
171 gfx::Rect OverflowBubbleView::GetBubbleBounds() { 171 gfx::Rect OverflowBubbleView::GetBubbleBounds() {
172 views::BubbleBorder* border = GetBubbleFrameView()->bubble_border(); 172 views::BubbleBorder* border = GetBubbleFrameView()->bubble_border();
173 gfx::Insets bubble_insets = border->GetInsets(); 173 gfx::Insets bubble_insets = border->GetInsets();
174 174
175 const int border_size = 175 const int border_size =
176 views::BubbleBorder::is_arrow_on_horizontal(arrow()) ? 176 views::BubbleBorder::is_arrow_on_horizontal(arrow()) ?
177 bubble_insets.left() : bubble_insets.top(); 177 bubble_insets.left() : bubble_insets.top();
178 const int arrow_offset = border_size + kPadding + kShelfViewLeadingInset + 178 const int arrow_offset = border_size + kPadding + kShelfViewLeadingInset +
179 kShelfSize / 2; 179 GetShelfLayoutConstant(SHELF_SIZE) / 2;
180 180
181 const gfx::Size content_size = GetPreferredSize(); 181 const gfx::Size content_size = GetPreferredSize();
182 border->set_arrow_offset(arrow_offset); 182 border->set_arrow_offset(arrow_offset);
183 183
184 const gfx::Rect anchor_rect = GetAnchorRect(); 184 const gfx::Rect anchor_rect = GetAnchorRect();
185 gfx::Rect bubble_rect = GetBubbleFrameView()->GetUpdatedWindowBounds( 185 gfx::Rect bubble_rect = GetBubbleFrameView()->GetUpdatedWindowBounds(
186 anchor_rect, 186 anchor_rect,
187 content_size, 187 content_size,
188 false); 188 false);
189 189
(...skipping 19 matching lines...) Expand all
209 209
210 bubble_rect.Offset(0, offset); 210 bubble_rect.Offset(0, offset);
211 border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y()); 211 border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y());
212 } 212 }
213 213
214 GetBubbleFrameView()->SchedulePaint(); 214 GetBubbleFrameView()->SchedulePaint();
215 return bubble_rect; 215 return bubble_rect;
216 } 216 }
217 217
218 } // namespace ash 218 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698