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

Side by Side Diff: ui/native_theme/native_theme_win.cc

Issue 2345183002: Views: Draw Textfield selected text in gray when top-level Widget loses focus.
Patch Set: Fix focus changing to other Views. Created 4 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
OLDNEW
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 "ui/native_theme/native_theme_win.h" 5 #include "ui/native_theme/native_theme_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 #include <vsstyle.h> 10 #include <vsstyle.h>
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 case kColorId_TextfieldDefaultBackground: 556 case kColorId_TextfieldDefaultBackground:
557 return system_colors_[COLOR_WINDOW]; 557 return system_colors_[COLOR_WINDOW];
558 case kColorId_TextfieldReadOnlyColor: 558 case kColorId_TextfieldReadOnlyColor:
559 return system_colors_[COLOR_GRAYTEXT]; 559 return system_colors_[COLOR_GRAYTEXT];
560 case kColorId_TextfieldReadOnlyBackground: 560 case kColorId_TextfieldReadOnlyBackground:
561 return system_colors_[COLOR_3DFACE]; 561 return system_colors_[COLOR_3DFACE];
562 case kColorId_TextfieldSelectionColor: 562 case kColorId_TextfieldSelectionColor:
563 return system_colors_[COLOR_HIGHLIGHTTEXT]; 563 return system_colors_[COLOR_HIGHLIGHTTEXT];
564 case kColorId_TextfieldSelectionBackgroundFocused: 564 case kColorId_TextfieldSelectionBackgroundFocused:
565 return system_colors_[COLOR_HIGHLIGHT]; 565 return system_colors_[COLOR_HIGHLIGHT];
566 case kColorId_TextfieldSelectionBackgroundUnfocused:
567 return system_colors_[IsUsingHighContrastTheme() ? COLOR_MENUHIGHLIGHT
568 : COLOR_BTNFACE];
tapted 2016/10/13 06:21:35 This comes up for kColorId_TreeSelectionBackground
Patti Lor 2016/10/24 02:43:17 Done.
566 569
567 // Tooltip 570 // Tooltip
568 case kColorId_TooltipBackground: 571 case kColorId_TooltipBackground:
569 case kColorId_TooltipText: 572 case kColorId_TooltipText:
570 NOTREACHED(); 573 NOTREACHED();
571 return gfx::kPlaceholderColor; 574 return gfx::kPlaceholderColor;
572 575
573 // Tree 576 // Tree
574 // NOTE: these aren't right for all themes, but as close as I could get. 577 // NOTE: these aren't right for all themes, but as close as I could get.
575 case kColorId_TreeBackground: 578 case kColorId_TreeBackground:
(...skipping 1536 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 break; 2115 break;
2113 case LAST: 2116 case LAST:
2114 NOTREACHED(); 2117 NOTREACHED();
2115 break; 2118 break;
2116 } 2119 }
2117 theme_handles_[theme_name] = handle; 2120 theme_handles_[theme_name] = handle;
2118 return handle; 2121 return handle;
2119 } 2122 }
2120 2123
2121 } // namespace ui 2124 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698