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

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

Issue 2382443007: Clean up NativeTheme (particularly CommonTheme). (Closed)
Patch Set: two slight fixes 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) 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 case kColorId_FocusedMenuItemBackgroundColor: 254 case kColorId_FocusedMenuItemBackgroundColor:
255 return GetBGColor(GetMenuItem(), SELECTED); 255 return GetBGColor(GetMenuItem(), SELECTED);
256 #else 256 #else
257 case kColorId_SelectedMenuItemForegroundColor: 257 case kColorId_SelectedMenuItemForegroundColor:
258 return GetTextColor(GetMenuItem(), PRELIGHT); 258 return GetTextColor(GetMenuItem(), PRELIGHT);
259 case kColorId_FocusedMenuItemBackgroundColor: 259 case kColorId_FocusedMenuItemBackgroundColor:
260 return GetBGColor(GetMenuItem(), PRELIGHT); 260 return GetBGColor(GetMenuItem(), PRELIGHT);
261 #endif 261 #endif
262 262
263 case kColorId_EnabledMenuItemForegroundColor: 263 case kColorId_EnabledMenuItemForegroundColor:
264 case kColorId_DisabledEmphasizedMenuItemForegroundColor:
265 return GetTextColor(GetMenuItem(), NORMAL); 264 return GetTextColor(GetMenuItem(), NORMAL);
266 case kColorId_DisabledMenuItemForegroundColor: 265 case kColorId_DisabledMenuItemForegroundColor:
267 return GetTextColor(GetMenuItem(), INSENSITIVE); 266 return GetTextColor(GetMenuItem(), INSENSITIVE);
268 case kColorId_HoverMenuItemBackgroundColor:
269 return GetBGColor(GetMenuItem(), PRELIGHT);
270 case kColorId_FocusedMenuButtonBorderColor: 267 case kColorId_FocusedMenuButtonBorderColor:
271 return GetBGColor(GetEntry(), NORMAL); 268 return GetBGColor(GetEntry(), NORMAL);
272 case kColorId_HoverMenuButtonBorderColor: 269 case kColorId_HoverMenuButtonBorderColor:
273 return GetTextAAColor(GetEntry(), PRELIGHT); 270 return GetTextAAColor(GetEntry(), PRELIGHT);
274 case kColorId_MenuBorderColor: 271 case kColorId_MenuBorderColor:
275 case kColorId_EnabledMenuButtonBorderColor: 272 case kColorId_EnabledMenuButtonBorderColor:
276 case kColorId_MenuSeparatorColor: { 273 case kColorId_MenuSeparatorColor: {
277 return GetTextColor(GetMenuItem(), INSENSITIVE); 274 return GetTextColor(GetMenuItem(), INSENSITIVE);
278 } 275 }
279 case kColorId_MenuBackgroundColor: 276 case kColorId_MenuBackgroundColor:
280 return GetBGColor(GetMenu(), NORMAL); 277 return GetBGColor(GetMenu(), NORMAL);
281 278
282 // Label 279 // Label
283 case kColorId_LabelEnabledColor: 280 case kColorId_LabelEnabledColor:
284 return GetTextColor(GetEntry(), NORMAL); 281 return GetTextColor(GetEntry(), NORMAL);
285 case kColorId_LabelDisabledColor: 282 case kColorId_LabelDisabledColor:
286 return GetTextColor(GetLabel(), INSENSITIVE); 283 return GetTextColor(GetLabel(), INSENSITIVE);
287 case kColorId_LabelBackgroundColor:
288 return GetBGColor(GetWindow(), NORMAL);
289 284
290 // Link 285 // Link
291 case kColorId_LinkDisabled: 286 case kColorId_LinkDisabled:
292 return SkColorSetA(GetSystemColor(kColorId_LinkEnabled), 0xBB); 287 return SkColorSetA(GetSystemColor(kColorId_LinkEnabled), 0xBB);
293 case kColorId_LinkEnabled: { 288 case kColorId_LinkEnabled: {
294 SkColor link_color = SK_ColorTRANSPARENT; 289 SkColor link_color = SK_ColorTRANSPARENT;
295 GetChromeStyleColor("link-color", &link_color); 290 GetChromeStyleColor("link-color", &link_color);
296 if (link_color != SK_ColorTRANSPARENT) 291 if (link_color != SK_ColorTRANSPARENT)
297 return link_color; 292 return link_color;
298 // Default color comes from gtklinkbutton.c. 293 // Default color comes from gtklinkbutton.c.
299 return SkColorSetRGB(0x00, 0x00, 0xEE); 294 return SkColorSetRGB(0x00, 0x00, 0xEE);
300 } 295 }
301 case kColorId_LinkPressed: 296 case kColorId_LinkPressed:
302 return SK_ColorRED; 297 return SK_ColorRED;
303 298
304 // Button 299 // Button
305 case kColorId_ButtonBackgroundColor:
306 return GetBGColor(GetButton(), NORMAL);
307 case kColorId_ButtonEnabledColor: 300 case kColorId_ButtonEnabledColor:
308 return GetTextColor(GetButton(), NORMAL); 301 return GetTextColor(GetButton(), NORMAL);
309 case kColorId_BlueButtonEnabledColor: 302 case kColorId_BlueButtonEnabledColor:
310 return GetTextColor(GetBlueButton(), NORMAL); 303 return GetTextColor(GetBlueButton(), NORMAL);
311 case kColorId_ButtonDisabledColor: 304 case kColorId_ButtonDisabledColor:
312 return GetTextColor(GetButton(), INSENSITIVE); 305 return GetTextColor(GetButton(), INSENSITIVE);
313 case kColorId_BlueButtonDisabledColor: 306 case kColorId_BlueButtonDisabledColor:
314 return GetTextColor(GetBlueButton(), INSENSITIVE); 307 return GetTextColor(GetBlueButton(), INSENSITIVE);
315 case kColorId_ButtonHighlightColor:
316 return GetBaseColor(GetButton(), SELECTED);
317 case kColorId_ButtonHoverColor: 308 case kColorId_ButtonHoverColor:
318 return GetTextColor(GetButton(), PRELIGHT); 309 return GetTextColor(GetButton(), PRELIGHT);
319 case kColorId_BlueButtonHoverColor: 310 case kColorId_BlueButtonHoverColor:
320 return GetTextColor(GetBlueButton(), PRELIGHT); 311 return GetTextColor(GetBlueButton(), PRELIGHT);
321 case kColorId_ButtonHoverBackgroundColor:
322 return GetBGColor(GetButton(), PRELIGHT);
323 case kColorId_BlueButtonPressedColor: 312 case kColorId_BlueButtonPressedColor:
324 return GetTextColor(GetBlueButton(), ACTIVE); 313 return GetTextColor(GetBlueButton(), ACTIVE);
325 case kColorId_BlueButtonShadowColor: 314 case kColorId_BlueButtonShadowColor:
326 return SK_ColorTRANSPARENT; 315 return SK_ColorTRANSPARENT;
327 // return GetTextColor(GetButton(), NORMAL);
tdanderson 2016/09/30 21:00:56 strange...
328 case kColorId_ProminentButtonColor: 316 case kColorId_ProminentButtonColor:
329 return GetSystemColor(kColorId_LinkEnabled); 317 return GetSystemColor(kColorId_LinkEnabled);
330 case kColorId_TextOnProminentButtonColor: 318 case kColorId_TextOnProminentButtonColor:
331 return GetTextColor(GetLabel(), SELECTED); 319 return GetTextColor(GetLabel(), SELECTED);
332 case kColorId_ButtonPressedShade: 320 case kColorId_ButtonPressedShade:
333 return SK_ColorTRANSPARENT; 321 return SK_ColorTRANSPARENT;
334 322
335 // Textfield 323 // Textfield
336 case kColorId_TextfieldDefaultColor: 324 case kColorId_TextfieldDefaultColor:
337 return GetTextColor(GetEntry(), NORMAL); 325 return GetTextColor(GetEntry(), NORMAL);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 572
585 if (!fake_menu_item) { 573 if (!fake_menu_item) {
586 fake_menu_item = gtk_custom_menu_item_new(); 574 fake_menu_item = gtk_custom_menu_item_new();
587 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item); 575 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
588 } 576 }
589 577
590 return fake_menu_item; 578 return fake_menu_item;
591 } 579 }
592 580
593 } // namespace libgtk2ui 581 } // namespace libgtk2ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698