| OLD | NEW |
| 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/common/shelf/overflow_bubble_view.h" | 5 #include "ash/common/shelf/overflow_bubble_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/shelf/shelf_constants.h" | 10 #include "ash/common/shelf/shelf_constants.h" |
| 11 #include "ash/common/shelf/wm_shelf.h" | 11 #include "ash/common/shelf/wm_shelf.h" |
| 12 #include "ash/common/shelf/wm_shelf_util.h" | 12 #include "ash/common/shelf/wm_shelf_util.h" |
| 13 #include "ash/common/wm_lookup.h" | 13 #include "ash/common/wm_lookup.h" |
| 14 #include "ash/common/wm_window.h" | 14 #include "ash/common/wm_window.h" |
| 15 #include "ash/public/cpp/shell_window_ids.h" | 15 #include "ash/public/cpp/shell_window_ids.h" |
| 16 #include "ash/root_window_controller.h" | 16 #include "ash/root_window_controller.h" |
| 17 #include "ui/compositor/layer_type.h" |
| 17 #include "ui/display/display.h" | 18 #include "ui/display/display.h" |
| 18 #include "ui/display/screen.h" | 19 #include "ui/display/screen.h" |
| 19 #include "ui/events/event.h" | 20 #include "ui/events/event.h" |
| 20 #include "ui/gfx/geometry/insets.h" | 21 #include "ui/gfx/geometry/insets.h" |
| 21 #include "ui/views/bubble/bubble_frame_view.h" | 22 #include "ui/views/bubble/bubble_frame_view.h" |
| 22 #include "ui/views/view.h" | 23 #include "ui/views/view.h" |
| 23 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
| 24 | 25 |
| 25 namespace ash { | 26 namespace ash { |
| 26 namespace { | 27 namespace { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 53 ? kShelfBaseColor | 54 ? kShelfBaseColor |
| 54 : SkColorSetA(kShelfBaseColor, | 55 : SkColorSetA(kShelfBaseColor, |
| 55 GetShelfConstant(SHELF_BACKGROUND_ALPHA)); | 56 GetShelfConstant(SHELF_BACKGROUND_ALPHA)); |
| 56 set_color(color); | 57 set_color(color); |
| 57 set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding)); | 58 set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding)); |
| 58 // Overflow bubble should not get focus. If it get focus when it is shown, | 59 // Overflow bubble should not get focus. If it get focus when it is shown, |
| 59 // active state item is changed to running state. | 60 // active state item is changed to running state. |
| 60 set_can_activate(false); | 61 set_can_activate(false); |
| 61 | 62 |
| 62 // Makes bubble view has a layer and clip its children layers. | 63 // Makes bubble view has a layer and clip its children layers. |
| 63 SetPaintToLayer(true); | 64 SetPaintToLayer(ui::LAYER_TEXTURED); |
| 64 layer()->SetFillsBoundsOpaquely(false); | 65 layer()->SetFillsBoundsOpaquely(false); |
| 65 layer()->SetMasksToBounds(true); | 66 layer()->SetMasksToBounds(true); |
| 66 | 67 |
| 67 // Calls into OnBeforeBubbleWidgetInit to set the window parent container. | 68 // Calls into OnBeforeBubbleWidgetInit to set the window parent container. |
| 68 views::BubbleDialogDelegateView::CreateBubble(this); | 69 views::BubbleDialogDelegateView::CreateBubble(this); |
| 69 AddChildView(shelf_view_); | 70 AddChildView(shelf_view_); |
| 70 } | 71 } |
| 71 | 72 |
| 72 bool OverflowBubbleView::IsHorizontalAlignment() const { | 73 bool OverflowBubbleView::IsHorizontalAlignment() const { |
| 73 return ::ash::IsHorizontalAlignment(wm_shelf_->GetAlignment()); | 74 return ::ash::IsHorizontalAlignment(wm_shelf_->GetAlignment()); |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 | 230 |
| 230 bubble_rect.Offset(0, offset); | 231 bubble_rect.Offset(0, offset); |
| 231 border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y()); | 232 border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y()); |
| 232 } | 233 } |
| 233 | 234 |
| 234 GetBubbleFrameView()->SchedulePaint(); | 235 GetBubbleFrameView()->SchedulePaint(); |
| 235 return bubble_rect; | 236 return bubble_rect; |
| 236 } | 237 } |
| 237 | 238 |
| 238 } // namespace ash | 239 } // namespace ash |
| OLD | NEW |