Views: Draw Textfield selected text in gray when top-level Widget loses focus.

ui/gfx/render_text.cc

 // Copyright (c) 2012 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 "ui/gfx/render_text.h"
 
 #include <limits.h>
 
 #include <algorithm>
 #include <climits>
@@ skipping 35 matching lines @@
 namespace {
 
 // All chars are replaced by this char when the password style is set.
 // TODO(benrg): GTK uses the first of U+25CF, U+2022, U+2731, U+273A, '*'
 // that's available in the font (find_invisible_char() in gtkentry.c).
 const base::char16 kPasswordReplacementChar = '*';
 
 // Default color used for the text and cursor.
 const SkColor kDefaultColor = SK_ColorBLACK;
 
-// Default color used for drawing selection background.
+// Default colors used for drawing selection backgrounds.
 const SkColor kDefaultSelectionBackgroundColor = SK_ColorGRAY;
+const SkColor kDefaultUnfocusedSelectionBackgroundColor = 0xffdcdcdc;

[tapted, 2016/09/20 06:57:55]

Will this be similar to SK_ColorGRAY anyway? (does anything end up using
kDefaultSelectionBackgroundColor for selection_background_focused_color_? maybe
it's fine just to use the same constant for both)

[Patti Lor, 2016/10/12 05:53:00]

It's a bit lighter (I just used the Mac default unfocused selection colour
here). But yeah I think there are native_theme_*s for pretty much all the
platforms, so will do as you said & deleted this :)

 
 // Fraction of the text size to lower a strike through below the baseline.
 const SkScalar kStrikeThroughOffset = (-SK_Scalar1 * 6 / 21);
 // Fraction of the text size to lower an underline below the baseline.
 const SkScalar kUnderlineOffset = (SK_Scalar1 / 9);
 // Fraction of the text size to use for a strike through or under-line.
 const SkScalar kLineThickness = (SK_Scalar1 / 18);
 // Fraction of the text size to use for a top margin of a diagonal strike.
 const SkScalar kDiagonalStrikeMarginOffset = (SK_Scalar1 / 4);
 
@@ skipping 804 matching lines @@
   EnsureLayout();
 
   if (clip_to_display_rect()) {
     Rect clip_rect(display_rect());
     clip_rect.Inset(ShadowValue::GetMargin(shadows_));
 
     canvas->Save();
     canvas->ClipRect(clip_rect);
   }
 
-  if (!text().empty() && focused())
+  if (!selection().is_empty())
     DrawSelection(canvas);
 
   if (cursor_enabled() && cursor_visible() && focused())
     DrawCursor(canvas, selection_model_);
 
   if (!text().empty()) {
     internal::SkiaTextRenderer renderer(canvas);
     if (halo_effect())
       renderer.SetHaloEffect();
     DrawVisualText(&renderer);
@@ skipping 151 matching lines @@
 
 RenderText::RenderText()
     : horizontal_alignment_(base::i18n::IsRTL() ? ALIGN_RIGHT : ALIGN_LEFT),
       directionality_mode_(DIRECTIONALITY_FROM_TEXT),
       text_direction_(base::i18n::UNKNOWN_DIRECTION),
       cursor_enabled_(true),
       cursor_visible_(false),
       cursor_color_(kDefaultColor),
       selection_color_(kDefaultColor),
       selection_background_focused_color_(kDefaultSelectionBackgroundColor),
+      selection_background_unfocused_color_(
+          kDefaultUnfocusedSelectionBackgroundColor),
+      draw_unfocused_selection_(false),
       focused_(false),
       composition_range_(Range::InvalidRange()),
       colors_(kDefaultColor),
       baselines_(NORMAL_BASELINE),
       weights_(Font::Weight::NORMAL),
       styles_(NUM_TEXT_STYLES),
       composition_and_selection_styles_applied_(false),
       obscured_(false),
       obscured_reveal_index_(-1),
       truncate_length_(0),
@@ skipping 552 matching lines @@
     if (cursor_bounds_.right() > display_rect_.right())
       delta_x = display_rect_.right() - cursor_bounds_.right();
     else if (cursor_bounds_.x() < display_rect_.x())
       delta_x = display_rect_.x() - cursor_bounds_.x();
   }
 
   SetDisplayOffset(display_offset_.x() + delta_x);
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
+  if (!focused() && !draw_unfocused_selection_)
+    return;
+  SkColor background_color = focused() ? selection_background_focused_color_
+                                       : selection_background_unfocused_color_;
   for (const Rect& s : GetSubstringBounds(selection()))
-    canvas->FillRect(s, selection_background_focused_color_);
+    canvas->FillRect(s, background_color);
 }
 
 }  // namespace gfx