Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(620)

Side by Side Diff: chrome/browser/chromeos/login/network_selection_view.cc

Issue 8221027: Make views::Label and views::Link auto-color themselves to be readable over their background colo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/network_selection_view.h" 5 #include "chrome/browser/chromeos/login/network_selection_view.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/chromeos/login/helper.h" 13 #include "chrome/browser/chromeos/login/helper.h"
14 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h" 14 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h"
15 #include "chrome/browser/chromeos/login/language_switch_menu.h" 15 #include "chrome/browser/chromeos/login/language_switch_menu.h"
16 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 16 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
17 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 17 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
18 #include "chrome/browser/chromeos/login/views_network_screen_actor.h" 18 #include "chrome/browser/chromeos/login/views_network_screen_actor.h"
19 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" 19 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
20 #include "chrome/browser/chromeos/status/network_dropdown_button.h" 20 #include "chrome/browser/chromeos/status/network_dropdown_button.h"
21 #include "grit/chromium_strings.h" 21 #include "grit/chromium_strings.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/color_utils.h"
26 #include "ui/gfx/size.h" 27 #include "ui/gfx/size.h"
27 #include "views/controls/label.h" 28 #include "views/controls/label.h"
28 #include "views/controls/link.h" 29 #include "views/controls/link.h"
29 #include "views/controls/button/text_button.h" 30 #include "views/controls/button/text_button.h"
30 #include "views/controls/throbber.h" 31 #include "views/controls/throbber.h"
31 #include "views/layout/fill_layout.h" 32 #include "views/layout/fill_layout.h"
32 #include "views/layout/grid_layout.h" 33 #include "views/layout/grid_layout.h"
33 #include "views/layout/layout_constants.h" 34 #include "views/layout/layout_constants.h"
34 #include "views/widget/widget.h" 35 #include "views/widget/widget.h"
35 #include "views/window/non_client_view.h" 36 #include "views/window/non_client_view.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 contents_view_ = new views::View(); 283 contents_view_ = new views::View();
283 284
284 entire_screen_view_ = new views::View(); 285 entire_screen_view_ = new views::View();
285 AddChildView(entire_screen_view_); 286 AddChildView(entire_screen_view_);
286 287
287 // Use rounded rect background. 288 // Use rounded rect background.
288 views::Painter* painter = CreateWizardPainter( 289 views::Painter* painter = CreateWizardPainter(
289 &BorderDefinition::kScreenBorder); 290 &BorderDefinition::kScreenBorder);
290 contents_view_->set_background( 291 contents_view_->set_background(
291 views::Background::CreateBackgroundPainter(true, painter)); 292 views::Background::CreateBackgroundPainter(true, painter));
293 SkColor background_color = color_utils::AlphaBlend(
294 BorderDefinition::kScreenBorder.top_color,
295 BorderDefinition::kScreenBorder.bottom_color, 128);
292 296
293 welcome_label_ = new views::Label(); 297 welcome_label_ = new views::Label();
294 welcome_label_->SetColor(kWelcomeColor); 298 welcome_label_->SetEnabledColor(kWelcomeColor);
299 welcome_label_->SetBackgroundColor(background_color);
295 welcome_label_->SetMultiLine(true); 300 welcome_label_->SetMultiLine(true);
296 301
297 select_language_label_ = new views::Label(); 302 select_language_label_ = new views::Label();
303 select_language_label_->SetBackgroundColor(background_color);
298 304
299 languages_menubutton_ = new NotifyingMenuButton( 305 languages_menubutton_ = new NotifyingMenuButton(
300 NULL, std::wstring(), actor_->language_switch_menu(), true, actor_); 306 NULL, std::wstring(), actor_->language_switch_menu(), true, actor_);
301 InitMenuButtonProperties(languages_menubutton_); 307 InitMenuButtonProperties(languages_menubutton_);
302 308
303 select_keyboard_label_ = new views::Label(); 309 select_keyboard_label_ = new views::Label();
310 select_keyboard_label_->SetBackgroundColor(background_color);
304 311
305 keyboards_menubutton_ = new DropDownButton( 312 keyboards_menubutton_ = new DropDownButton(
306 NULL /* listener */, L"", actor_->keyboard_switch_menu(), 313 NULL /* listener */, L"", actor_->keyboard_switch_menu(),
307 true /* show_menu_marker */); 314 true /* show_menu_marker */);
308 InitMenuButtonProperties(keyboards_menubutton_); 315 InitMenuButtonProperties(keyboards_menubutton_);
309 316
310 select_network_label_ = new views::Label(); 317 select_network_label_ = new views::Label();
318 select_network_label_->SetBackgroundColor(background_color);
311 319
312 network_dropdown_ = new NetworkControlReportOnActivate(false, 320 network_dropdown_ = new NetworkControlReportOnActivate(false,
313 GetNativeWindow(), 321 GetNativeWindow(),
314 actor_); 322 actor_);
315 InitMenuButtonProperties(network_dropdown_); 323 InitMenuButtonProperties(network_dropdown_);
316 324
317 connecting_network_label_ = new views::Label(); 325 connecting_network_label_ = new views::Label();
326 connecting_network_label_->SetBackgroundColor(background_color);
318 connecting_network_label_->SetVisible(false); 327 connecting_network_label_->SetVisible(false);
319 328
320 proxy_settings_link_ = new views::Link(); 329 proxy_settings_link_ = new views::Link();
321 proxy_settings_link_->set_listener(this); 330 proxy_settings_link_->set_listener(this);
322 proxy_settings_link_->SetVisible(true); 331 proxy_settings_link_->SetVisible(true);
323 proxy_settings_link_->set_focusable(true); 332 proxy_settings_link_->set_focusable(true);
324 proxy_settings_link_->SetNormalColor(login::kLinkColor); 333 proxy_settings_link_->SetBackgroundColor(background_color);
325 proxy_settings_link_->SetHighlightedColor(login::kLinkColor); 334 proxy_settings_link_->SetEnabledColor(login::kLinkColor);
335 proxy_settings_link_->SetPressedColor(login::kLinkColor);
326 336
327 UpdateLocalizedStringsAndFonts(); 337 UpdateLocalizedStringsAndFonts();
328 } 338 }
329 339
330 void NetworkSelectionView::UpdateLocalizedStringsAndFonts() { 340 void NetworkSelectionView::UpdateLocalizedStringsAndFonts() {
331 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 341 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
332 gfx::Font welcome_label_font = rb.GetFont(ResourceBundle::LargeFont). 342 gfx::Font welcome_label_font = rb.GetFont(ResourceBundle::LargeFont).
333 DeriveFont(kWelcomeTitleFontDelta, gfx::Font::BOLD); 343 DeriveFont(kWelcomeTitleFontDelta, gfx::Font::BOLD);
334 gfx::Font select_label_font = rb.GetFont(ResourceBundle::MediumFont). 344 gfx::Font select_label_font = rb.GetFont(ResourceBundle::MediumFont).
335 DeriveFont(kNetworkSelectionLabelFontDelta); 345 DeriveFont(kNetworkSelectionLabelFontDelta);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON))); 480 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)));
471 continue_button_->SetEnabled(is_continue_enabled); 481 continue_button_->SetEnabled(is_continue_enabled);
472 } 482 }
473 483
474 void NetworkSelectionView::UpdateConnectingNetworkLabel() { 484 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
475 connecting_network_label_->SetText(l10n_util::GetStringFUTF16( 485 connecting_network_label_->SetText(l10n_util::GetStringFUTF16(
476 IDS_NETWORK_SELECTION_CONNECTING, network_id_)); 486 IDS_NETWORK_SELECTION_CONNECTING, network_id_));
477 } 487 }
478 488
479 } // namespace chromeos 489 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/message_bubble.cc ('k') | chrome/browser/chromeos/login/new_user_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698