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

Side by Side Diff: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

Issue 1844193002: Fix text coloration for GTK-themed MdTextButtons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ui/libgtk2ui/native_theme_gtk2.h" 5 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h" 9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
10 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h" 10 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h"
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 case kColorId_ButtonHoverBackgroundColor: 319 case kColorId_ButtonHoverBackgroundColor:
320 return GetBGColor(GetButton(), PRELIGHT); 320 return GetBGColor(GetButton(), PRELIGHT);
321 case kColorId_BlueButtonPressedColor: 321 case kColorId_BlueButtonPressedColor:
322 return GetTextColor(GetBlueButton(), ACTIVE); 322 return GetTextColor(GetBlueButton(), ACTIVE);
323 case kColorId_BlueButtonShadowColor: 323 case kColorId_BlueButtonShadowColor:
324 return SK_ColorTRANSPARENT; 324 return SK_ColorTRANSPARENT;
325 // return GetTextColor(GetButton(), NORMAL); 325 // return GetTextColor(GetButton(), NORMAL);
326 case kColorId_CallToActionColor: 326 case kColorId_CallToActionColor:
327 return GetSystemColor(kColorId_LinkEnabled); 327 return GetSystemColor(kColorId_LinkEnabled);
328 case kColorId_TextOnCallToActionColor: 328 case kColorId_TextOnCallToActionColor:
329 return GetTextAAColor(GetLabel(), PRELIGHT); 329 return GetTextColor(GetLabel(), SELECTED);
330 330
331 // Textfield 331 // Textfield
332 case kColorId_TextfieldDefaultColor: 332 case kColorId_TextfieldDefaultColor:
333 return GetTextColor(GetEntry(), NORMAL); 333 return GetTextColor(GetEntry(), NORMAL);
334 case kColorId_TextfieldDefaultBackground: 334 case kColorId_TextfieldDefaultBackground:
335 return GetBaseColor(GetEntry(), NORMAL); 335 return GetBaseColor(GetEntry(), NORMAL);
336 336
337 #if GTK_MAJOR_VERSION == 2 337 #if GTK_MAJOR_VERSION == 2
338 case kColorId_TextfieldReadOnlyColor: 338 case kColorId_TextfieldReadOnlyColor:
339 return GetTextColor(GetEntry(), ACTIVE); 339 return GetTextColor(GetEntry(), ACTIVE);
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 571
572 if (!fake_menu_item) { 572 if (!fake_menu_item) {
573 fake_menu_item = gtk_custom_menu_item_new(); 573 fake_menu_item = gtk_custom_menu_item_new();
574 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item); 574 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
575 } 575 }
576 576
577 return fake_menu_item; 577 return fake_menu_item;
578 } 578 }
579 579
580 } // namespace libgtk2ui 580 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698