OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/system/tray/tray_popup_utils.h" | 5 #include "ash/common/system/tray/tray_popup_utils.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/ash_constants.h" | 10 #include "ash/common/ash_constants.h" |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
288 views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0))); | 288 views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0))); |
289 view->SetPaintToLayer(); | 289 view->SetPaintToLayer(); |
290 view->layer()->SetFillsBoundsOpaquely(false); | 290 view->layer()->SetFillsBoundsOpaquely(false); |
291 } | 291 } |
292 | 292 |
293 void TrayPopupUtils::ShowStickyHeaderSeparator(views::View* view, | 293 void TrayPopupUtils::ShowStickyHeaderSeparator(views::View* view, |
294 bool show_separator) { | 294 bool show_separator) { |
295 if (show_separator) { | 295 if (show_separator) { |
296 view->SetBorder(views::CreatePaddedBorder( | 296 view->SetBorder(views::CreatePaddedBorder( |
297 views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0, | 297 views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0, |
298 kHorizontalSeparatorColor), | 298 kMenuSeparatorColor), |
299 gfx::Insets(kMenuSeparatorVerticalPadding, 0, | 299 gfx::Insets(kMenuSeparatorVerticalPadding, 0, |
300 kMenuSeparatorVerticalPadding - kSeparatorWidth, 0))); | 300 kMenuSeparatorVerticalPadding - kSeparatorWidth, 0))); |
301 } else { | 301 } else { |
302 view->SetBorder(views::CreateEmptyBorder( | 302 view->SetBorder(views::CreateEmptyBorder( |
303 gfx::Insets(kMenuSeparatorVerticalPadding, 0))); | 303 gfx::Insets(kMenuSeparatorVerticalPadding, 0))); |
304 } | 304 } |
305 view->SchedulePaint(); | 305 view->SchedulePaint(); |
306 } | 306 } |
307 | 307 |
308 void TrayPopupUtils::ConfigureContainer(TriView::Container container, | 308 void TrayPopupUtils::ConfigureContainer(TriView::Container container, |
(...skipping 14 matching lines...) Expand all Loading... | |
323 if (!MaterialDesignController::IsSystemTrayMenuMaterial()) | 323 if (!MaterialDesignController::IsSystemTrayMenuMaterial()) |
324 return CreateTrayPopupBorderlessButton(listener, text); | 324 return CreateTrayPopupBorderlessButton(listener, text); |
325 | 325 |
326 auto* button = views::MdTextButton::Create(listener, text); | 326 auto* button = views::MdTextButton::Create(listener, text); |
327 button->SetProminent(true); | 327 button->SetProminent(true); |
328 return button; | 328 return button; |
329 } | 329 } |
330 | 330 |
331 views::Separator* TrayPopupUtils::CreateVerticalSeparator() { | 331 views::Separator* TrayPopupUtils::CreateVerticalSeparator() { |
332 views::Separator* separator = | 332 views::Separator* separator = |
333 new views::Separator(views::Separator::HORIZONTAL); | 333 new views::Separator(views::Separator::VERTICAL); |
Evan Stade
2017/02/03 20:38:19
This was actually creating a horizontal separator
| |
334 separator->SetPreferredSize(kHorizontalSeparatorHeight); | 334 separator->SetPreferredLength(24); |
335 separator->SetColor(kHorizontalSeparatorColor); | 335 separator->SetColor(kMenuSeparatorColor); |
336 return separator; | 336 return separator; |
337 } | 337 } |
338 | 338 |
339 std::unique_ptr<views::InkDrop> TrayPopupUtils::CreateInkDrop( | 339 std::unique_ptr<views::InkDrop> TrayPopupUtils::CreateInkDrop( |
340 TrayPopupInkDropStyle ink_drop_style, | 340 TrayPopupInkDropStyle ink_drop_style, |
341 views::InkDropHostView* host) { | 341 views::InkDropHostView* host) { |
342 std::unique_ptr<views::InkDropImpl> ink_drop = | 342 std::unique_ptr<views::InkDropImpl> ink_drop = |
343 base::MakeUnique<views::InkDropImpl>(host, host->size()); | 343 base::MakeUnique<views::InkDropImpl>(host, host->size()); |
344 ink_drop->SetAutoHighlightMode( | 344 ink_drop->SetAutoHighlightMode( |
345 views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE); | 345 views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
416 gfx::Rect TrayPopupUtils::GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style, | 416 gfx::Rect TrayPopupUtils::GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style, |
417 const views::View* host) { | 417 const views::View* host) { |
418 gfx::Rect bounds = host->GetLocalBounds(); | 418 gfx::Rect bounds = host->GetLocalBounds(); |
419 bounds.Inset(GetInkDropInsets(ink_drop_style)); | 419 bounds.Inset(GetInkDropInsets(ink_drop_style)); |
420 return bounds; | 420 return bounds; |
421 } | 421 } |
422 | 422 |
423 views::Separator* TrayPopupUtils::CreateListItemSeparator(bool left_inset) { | 423 views::Separator* TrayPopupUtils::CreateListItemSeparator(bool left_inset) { |
424 views::Separator* separator = | 424 views::Separator* separator = |
425 new views::Separator(views::Separator::HORIZONTAL); | 425 new views::Separator(views::Separator::HORIZONTAL); |
426 separator->SetColor(kHorizontalSeparatorColor); | 426 separator->SetColor(kMenuSeparatorColor); |
427 separator->SetPreferredSize(kSeparatorWidth); | |
428 separator->SetBorder(views::CreateEmptyBorder( | 427 separator->SetBorder(views::CreateEmptyBorder( |
429 kMenuSeparatorVerticalPadding - kSeparatorWidth, | 428 kMenuSeparatorVerticalPadding - views::Separator::kThickness, |
430 left_inset | 429 left_inset |
431 ? kMenuExtraMarginFromLeftEdge + kMenuButtonSize + | 430 ? kMenuExtraMarginFromLeftEdge + kMenuButtonSize + |
432 kTrayPopupLabelHorizontalPadding | 431 kTrayPopupLabelHorizontalPadding |
433 : 0, | 432 : 0, |
434 kMenuSeparatorVerticalPadding, 0)); | 433 kMenuSeparatorVerticalPadding, 0)); |
435 return separator; | 434 return separator; |
436 } | 435 } |
437 | 436 |
438 views::Separator* TrayPopupUtils::CreateListSubHeaderSeparator() { | 437 views::Separator* TrayPopupUtils::CreateListSubHeaderSeparator() { |
439 views::Separator* separator = | 438 views::Separator* separator = |
440 new views::Separator(views::Separator::HORIZONTAL); | 439 new views::Separator(views::Separator::HORIZONTAL); |
441 separator->SetColor(kHorizontalSeparatorColor); | 440 separator->SetColor(kMenuSeparatorColor); |
442 separator->SetPreferredSize(kSeparatorWidth); | |
443 separator->SetBorder(views::CreateEmptyBorder( | 441 separator->SetBorder(views::CreateEmptyBorder( |
444 kMenuSeparatorVerticalPadding - kSeparatorWidth, 0, 0, 0)); | 442 kMenuSeparatorVerticalPadding - views::Separator::kThickness, 0, 0, 0)); |
445 return separator; | 443 return separator; |
446 } | 444 } |
447 | 445 |
448 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) { | 446 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) { |
449 // TODO(tdanderson): Consider moving this into WmShell, or introduce a | 447 // TODO(tdanderson): Consider moving this into WmShell, or introduce a |
450 // CanShowSettings() method in each delegate type that has a | 448 // CanShowSettings() method in each delegate type that has a |
451 // ShowSettings() method. | 449 // ShowSettings() method. |
452 return status != LoginStatus::NOT_LOGGED_IN && | 450 return status != LoginStatus::NOT_LOGGED_IN && |
453 status != LoginStatus::LOCKED && | 451 status != LoginStatus::LOCKED && |
454 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen(); | 452 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen(); |
455 } | 453 } |
456 | 454 |
457 } // namespace ash | 455 } // namespace ash |
OLD | NEW |