diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 17:42:38 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 17:42:38 +0000 |
| commit | 982c498817773af6146878e518595d6fe34bcc63 (patch) | |
| tree | 52259fbe2002cd901fceae5463c99bc0a6b9ae16 /ash | |
| parent | 7e21bd1e1d7559ded0497a9e33de2d611651fdf8 (diff) | |
| download | chromium_src-982c498817773af6146878e518595d6fe34bcc63.zip chromium_src-982c498817773af6146878e518595d6fe34bcc63.tar.gz chromium_src-982c498817773af6146878e518595d6fe34bcc63.tar.bz2 | |
Adjust wifi toggle message layout to avoid the wrapping of the message too shortly.
BUG=263984
R=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/22601007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/chromeos/network/tray_network.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index fdaa4d8..e8c1683 100644 --- a/ash/system/chromeos/network/tray_network.cc +++ b/ash/system/chromeos/network/tray_network.cc @@ -264,6 +264,15 @@ class NetworkWifiDetailedView : public NetworkDetailedView { } private: + virtual void Layout() OVERRIDE { + // Center both views vertically. + views::View::Layout(); + image_view_->SetY( + (height() - image_view_->GetPreferredSize().height()) / 2); + label_view_->SetY( + (height() - label_view_->GetPreferredSize().height()) / 2); + } + void Update() { bool wifi_enabled = NetworkHandler::Get()->network_state_handler()-> IsTechnologyEnabled(flimflam::kTypeWifi); @@ -276,6 +285,9 @@ class NetworkWifiDetailedView : public NetworkDetailedView { IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED : IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED; label_view_->SetText(bundle.GetLocalizedString(string_id)); + label_view_->SizeToFit(kTrayPopupMinWidth - + kTrayPopupPaddingHorizontal * 2 - kTrayPopupPaddingBetweenItems - + kTrayPopupDetailsIconWidth); } views::ImageView* image_view_; |