Make views::Label and views::Link auto-color themselves to be readable over their background colo...

chrome/browser/ui/views/about_chrome_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 15 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/color_utils.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/link.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/throbber.h"
 #include "views/layout/layout_constants.h"
 #include "views/view_text_utils.h"
 #include "views/widget/widget.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/restart_message_box.h"
 #include "chrome/installer/util/install_util.h"
 #endif  // defined(OS_WIN)
 
 namespace {
 // These are used as placeholder text around the links in the text in the about
 // dialog.
 const string16 kBeginLink(ASCIIToUTF16("BEGIN_LINK"));
 const string16 kEndLink(ASCIIToUTF16("END_LINK"));
 const string16 kBeginLinkChr(ASCIIToUTF16("BEGIN_LINK_CHR"));
 const string16 kBeginLinkOss(ASCIIToUTF16("BEGIN_LINK_OSS"));
 const string16 kEndLinkChr(ASCIIToUTF16("END_LINK_CHR"));
 const string16 kEndLinkOss(ASCIIToUTF16("END_LINK_OSS"));
 
-// The background bitmap used to draw the background color for the About box
-// and the separator line (this is the image we will draw the logo on top of).
-static const SkBitmap* kBackgroundBmp = NULL;
-
 // Returns a substring from |text| between start and end.
 string16 StringSubRange(const string16& text, size_t start, size_t end) {
   DCHECK(end > start);
   return text.substr(start, end - start);
 }
 
 }  // namespace
 
 namespace browser {
 
@@ skipping 26 matching lines @@
       chromium_url_appears_first_(true),
       text_direction_is_rtl_(false) {
   DCHECK(profile);
 
   Init();
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   google_updater_ = new GoogleUpdate();
   google_updater_->set_status_listener(this);
 #endif
-
-  if (kBackgroundBmp == NULL) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    kBackgroundBmp = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_COLOR);
-  }
 }
 
 AboutChromeView::~AboutChromeView() {
 #if defined(OS_WIN) && !defined(USE_AURA)
   // The Google Updater will hold a pointer to us until it reports status, so we
   // need to let it know that we will no longer be listening.
   if (google_updater_)
     google_updater_->set_status_listener(NULL);
 #endif
 }
@@ skipping 32 matching lines @@
       IDR_ABOUT_BACKGROUND_RTL : IDR_ABOUT_BACKGROUND);
 
   about_dlg_background_logo_->SetImage(*about_background_logo);
   AddChildView(about_dlg_background_logo_);
 
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(18));
-  about_title_label_->SetColor(SK_ColorBLACK);
+  about_title_label_->SetBackgroundColor(SK_ColorWHITE);
+  about_title_label_->SetEnabledColor(SK_ColorBLACK);
   AddChildView(about_title_label_);
 
   // This is a text field so people can copy the version number from the dialog.
   version_label_ = new views::Textfield();
   chrome::VersionInfo version_info;
   version_label_->SetText(UTF8ToUTF16(version_info.CreateVersionString()));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
@@ skipping 36 matching lines @@
   AddChildView(chromium_url_);
   chromium_url_->set_listener(this);
 
   // The Open Source link within the main text of the dialog.
   open_source_url_ = new views::Link(
       StringSubRange(text, text.find(kBeginLinkOss) + kBeginLinkOss.size(),
                      text.find(kEndLinkOss)));
   AddChildView(open_source_url_);
   open_source_url_->set_listener(this);
 
+#if defined(OS_WIN)
+  SkColor background_color = color_utils::GetSysSkColor(COLOR_3DFACE);
+  copyright_label_->SetBackgroundColor(background_color);
+  main_text_label_->SetBackgroundColor(background_color);
+  chromium_url_->SetBackgroundColor(background_color);
+  open_source_url_->SetBackgroundColor(background_color);
+#endif
+
   // Add together all the strings in the dialog for the purpose of calculating
   // the height of the dialog. The space for the Terms of Service string is not
   // included (it is added later, if needed).
   string16 full_text = main_label_chunk1_ + chromium_url_->GetText() +
                        main_label_chunk2_ + open_source_url_->GetText() +
                        main_label_chunk3_;
 
   dialog_dimensions_ = views::Widget::GetLocalizedContentsSize(
       IDS_ABOUT_DIALOG_WIDTH_CHARS,
       IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES);
@@ skipping 138 matching lines @@
                           std::min(max_x - update_label_x, sz.width()),
                           sz.height());
 }
 
 void AboutChromeView::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   // Draw the background image color (and the separator) across the dialog.
   // This will become the background for the logo image at the top of the
   // dialog.
-  canvas->TileImageInt(*kBackgroundBmp, 0, 0,
-                       dialog_dimensions_.width(), kBackgroundBmp->height());
+  SkBitmap* background = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      IDR_ABOUT_BACKGROUND_COLOR);
+  canvas->TileImageInt(*background, 0, 0, dialog_dimensions_.width(),
+                       background->height());
 
   gfx::Font font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
   const gfx::Rect label_bounds = main_text_label_->bounds();
 
   views::Link* link1 =
       chromium_url_appears_first_ ? chromium_url_ : open_source_url_;
   views::Link* link2 =
       chromium_url_appears_first_ ? open_source_url_ : chromium_url_;
@@ skipping 327 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif