ash/common/system/tray/tray_item_view.cc - Issue 2465403002: Some more fixes to cros system tray icons (esp. screen tray items)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/system/tray/tray_item_view.cc

Issue 2465403002: Some more fixes to cros system tray icons (esp. screen tray items) (Closed)

Patch Set: commentary Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/common/system/tray/tray_item_view.cc

diff --git a/ash/common/system/tray/tray_item_view.cc b/ash/common/system/tray/tray_item_view.cc

index 3cc2830a9aad21f8e727bb61c36d28351ae938dd..579ad361cce55aaf672fdeb59345fe8f49aea76c 100644

--- a/ash/common/system/tray/tray_item_view.cc

+++ b/ash/common/system/tray/tray_item_view.cc

@@ -82,10 +82,11 @@ int TrayItemView::GetAnimationDurationMS() {

}

gfx::Size TrayItemView::GetPreferredSize() const {

+ DCHECK_EQ(1, child_count());

gfx::Size size;

if (MaterialDesignController::UseMaterialDesignSystemIcons()) {

gfx::Size inner_size = views::View::GetPreferredSize();

- if (image_view_ && child_count() == 1)

+ if (image_view_)

inner_size = gfx::Size(kTrayIconSize, kTrayIconSize);

gfx::Rect rect(inner_size);

rect.Inset(gfx::Insets(-GetTrayConstant(TRAY_IMAGE_ITEM_PADDING)));