ash/system/date/date_view.cc - Issue 1088353002: Prevent text eliding in ash TimeView.

Side by Side Diff

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

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

Side by Side Diff: ash/system/date/date_view.cc

Issue 1088353002: Prevent text eliding in ash TimeView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »

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 "ash/system/date/date_view.h"	5 #include "ash/system/date/date_view.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/system/tray/system_tray_delegate.h"	8 #include "ash/system/tray/system_tray_delegate.h"

9 #include "ash/system/tray/tray_constants.h"	9 #include "ash/system/tray/tray_constants.h"

10 #include "ash/system/tray/tray_utils.h"	10 #include "ash/system/tray/tray_utils.h"

(...skipping 317 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
328 SetupLabel(vertical_label_minutes_.get());	328 SetupLabel(vertical_label_minutes_.get());

329 vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor);	329 vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor);

330 // Pull the minutes up closer to the hours by using a negative top border.	330 // Pull the minutes up closer to the hours by using a negative top border.

331 vertical_label_minutes_->SetBorder(views::Border::CreateEmptyBorder(	331 vertical_label_minutes_->SetBorder(views::Border::CreateEmptyBorder(

332 kVerticalClockMinutesTopOffset, 0, 0, 0));	332 kVerticalClockMinutesTopOffset, 0, 0, 0));

333 }	333 }

334	334

335 void TimeView::SetupLabel(views::Label* label) {	335 void TimeView::SetupLabel(views::Label* label) {

336 label->set_owned_by_client();	336 label->set_owned_by_client();

337 SetupLabelForTray(label);	337 SetupLabelForTray(label);

	338 label->SetElideBehavior(gfx::NO_ELIDE);

338 }	339 }

339	340

340 } // namespace tray	341 } // namespace tray

341 } // namespace ash	342 } // namespace ash

OLD	NEW