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

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 up diff & add colors to Windows/Mac. Created 4 years, 3 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 case kColorId_TextfieldDefaultBackground: 529 case kColorId_TextfieldDefaultBackground:
530 return system_colors_[COLOR_WINDOW]; 530 return system_colors_[COLOR_WINDOW];
531 case kColorId_TextfieldReadOnlyColor: 531 case kColorId_TextfieldReadOnlyColor:
532 return system_colors_[COLOR_GRAYTEXT]; 532 return system_colors_[COLOR_GRAYTEXT];
533 case kColorId_TextfieldReadOnlyBackground: 533 case kColorId_TextfieldReadOnlyBackground:
534 return system_colors_[COLOR_3DFACE]; 534 return system_colors_[COLOR_3DFACE];
535 case kColorId_TextfieldSelectionColor: 535 case kColorId_TextfieldSelectionColor:
536 return system_colors_[COLOR_HIGHLIGHTTEXT]; 536 return system_colors_[COLOR_HIGHLIGHTTEXT];
537 case kColorId_TextfieldSelectionBackgroundFocused: 537 case kColorId_TextfieldSelectionBackgroundFocused:
538 return system_colors_[COLOR_HIGHLIGHT]; 538 return system_colors_[COLOR_HIGHLIGHT];
539 case kColorId_TextfieldSelectionBackgroundUnfocused:
540 return system_colors_[COLOR_HIGHLIGHT];
tapted 2016/09/20 06:57:55 This should maybe be the same as kColorId_TableSel
Patti Lor 2016/10/12 05:53:00 Done.
539 541
540 // Tooltip 542 // Tooltip
541 case kColorId_TooltipBackground: 543 case kColorId_TooltipBackground:
542 case kColorId_TooltipText: 544 case kColorId_TooltipText:
543 NOTREACHED(); 545 NOTREACHED();
544 return gfx::kPlaceholderColor; 546 return gfx::kPlaceholderColor;
545 547
546 // Tree 548 // Tree
547 // NOTE: these aren't right for all themes, but as close as I could get. 549 // NOTE: these aren't right for all themes, but as close as I could get.
548 case kColorId_TreeBackground: 550 case kColorId_TreeBackground:
(...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after
2062 break; 2064 break;
2063 case LAST: 2065 case LAST:
2064 NOTREACHED(); 2066 NOTREACHED();
2065 break; 2067 break;
2066 } 2068 }
2067 theme_handles_[theme_name] = handle; 2069 theme_handles_[theme_name] = handle;
2068 return handle; 2070 return handle;
2069 } 2071 }
2070 2072
2071 } // namespace ui 2073 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698