| OLD | NEW |
| 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 "ui/native_theme/native_theme_mac.h" | 5 #include "ui/native_theme/native_theme_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 case kColorId_DisabledEmphasizedMenuItemForegroundColor: | 181 case kColorId_DisabledEmphasizedMenuItemForegroundColor: |
| 182 return NSSystemColorToSkColor([NSColor disabledControlTextColor]); | 182 return NSSystemColorToSkColor([NSColor disabledControlTextColor]); |
| 183 case kColorId_SelectedMenuItemForegroundColor: | 183 case kColorId_SelectedMenuItemForegroundColor: |
| 184 return NSSystemColorToSkColor([NSColor selectedMenuItemTextColor]); | 184 return NSSystemColorToSkColor([NSColor selectedMenuItemTextColor]); |
| 185 case kColorId_FocusedMenuItemBackgroundColor: | 185 case kColorId_FocusedMenuItemBackgroundColor: |
| 186 case kColorId_HoverMenuItemBackgroundColor: | 186 case kColorId_HoverMenuItemBackgroundColor: |
| 187 return NSSystemColorToSkColor([NSColor selectedMenuItemColor]); | 187 return NSSystemColorToSkColor([NSColor selectedMenuItemColor]); |
| 188 case kColorId_MenuBackgroundColor: | 188 case kColorId_MenuBackgroundColor: |
| 189 return kMenuPopupBackgroundColor; | 189 return kMenuPopupBackgroundColor; |
| 190 case kColorId_MenuSeparatorColor: | 190 case kColorId_MenuSeparatorColor: |
| 191 return base::mac::IsOS10_9() ? kMenuSeparatorColorMavericks | 191 return base::mac::IsAtLeastOS10_10() ? kMenuSeparatorColor |
| 192 : kMenuSeparatorColor; | 192 : kMenuSeparatorColorMavericks; |
| 193 case kColorId_MenuBorderColor: | 193 case kColorId_MenuBorderColor: |
| 194 return kMenuBorderColor; | 194 return kMenuBorderColor; |
| 195 | 195 |
| 196 // Link. | 196 // Link. |
| 197 case kColorId_LinkDisabled: | 197 case kColorId_LinkDisabled: |
| 198 return SK_ColorBLACK; | 198 return SK_ColorBLACK; |
| 199 case kColorId_LinkEnabled: | 199 case kColorId_LinkEnabled: |
| 200 return SK_ColorBLUE; | 200 return SK_ColorBLUE; |
| 201 case kColorId_LinkPressed: | 201 case kColorId_LinkPressed: |
| 202 return SK_ColorRED; | 202 return SK_ColorRED; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 return GetAuraColor(color_id, this); | 243 return GetAuraColor(color_id, this); |
| 244 } | 244 } |
| 245 } | 245 } |
| 246 | 246 |
| 247 void NativeThemeMac::PaintMenuPopupBackground( | 247 void NativeThemeMac::PaintMenuPopupBackground( |
| 248 SkCanvas* canvas, | 248 SkCanvas* canvas, |
| 249 const gfx::Size& size, | 249 const gfx::Size& size, |
| 250 const MenuBackgroundExtraParams& menu_background) const { | 250 const MenuBackgroundExtraParams& menu_background) const { |
| 251 SkPaint paint; | 251 SkPaint paint; |
| 252 paint.setAntiAlias(true); | 252 paint.setAntiAlias(true); |
| 253 if (base::mac::IsOS10_9()) | 253 if (base::mac::IsAtLeastOS10_10()) |
| 254 paint.setColor(kMenuPopupBackgroundColor); |
| 255 else |
| 254 paint.setColor(kMenuPopupBackgroundColorMavericks); | 256 paint.setColor(kMenuPopupBackgroundColorMavericks); |
| 255 else | |
| 256 paint.setColor(kMenuPopupBackgroundColor); | |
| 257 const SkScalar radius = SkIntToScalar(menu_background.corner_radius); | 257 const SkScalar radius = SkIntToScalar(menu_background.corner_radius); |
| 258 SkRect rect = gfx::RectToSkRect(gfx::Rect(size)); | 258 SkRect rect = gfx::RectToSkRect(gfx::Rect(size)); |
| 259 canvas->drawRoundRect(rect, radius, radius, paint); | 259 canvas->drawRoundRect(rect, radius, radius, paint); |
| 260 } | 260 } |
| 261 | 261 |
| 262 void NativeThemeMac::PaintMenuItemBackground( | 262 void NativeThemeMac::PaintMenuItemBackground( |
| 263 SkCanvas* canvas, | 263 SkCanvas* canvas, |
| 264 State state, | 264 State state, |
| 265 const gfx::Rect& rect, | 265 const gfx::Rect& rect, |
| 266 const MenuItemExtraParams& menu_item) const { | 266 const MenuItemExtraParams& menu_item) const { |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 return ApplySystemControlTint(GetAuraColor(color_id, base_theme)); | 433 return ApplySystemControlTint(GetAuraColor(color_id, base_theme)); |
| 434 } | 434 } |
| 435 | 435 |
| 436 NativeThemeMac::NativeThemeMac() { | 436 NativeThemeMac::NativeThemeMac() { |
| 437 } | 437 } |
| 438 | 438 |
| 439 NativeThemeMac::~NativeThemeMac() { | 439 NativeThemeMac::~NativeThemeMac() { |
| 440 } | 440 } |
| 441 | 441 |
| 442 } // namespace ui | 442 } // namespace ui |
| OLD | NEW |