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

Unified Diff: ui/native_theme/native_theme_win.cc

Issue 2655553003: Native themes: Add menu separator part (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: ui/native_theme/native_theme_win.cc
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 24eaae35e6953f266d2048093adef6e60e163320..1ebbb0e7197ddd286bcba41d8eb159183c94b06e 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -264,7 +264,7 @@ void NativeThemeWin::Paint(SkCanvas* canvas,
PaintMenuGutter(canvas, rect);
return;
case kMenuPopupSeparator:
- PaintMenuSeparator(canvas, rect);
+ PaintMenuSeparator(canvas, rect, extra.menu_separator);
return;
case kMenuPopupBackground:
PaintMenuBackground(canvas, rect);
@@ -374,12 +374,15 @@ void NativeThemeWin::UpdateSystemColors() {
system_colors_[kSystemColor] = color_utils::GetSysSkColor(kSystemColor);
}
-void NativeThemeWin::PaintMenuSeparator(SkCanvas* canvas,
- const gfx::Rect& rect) const {
+void NativeThemeWin::PaintMenuSeparator(
+ SkCanvas* canvas,
+ const gfx::Rect& rect,
+ const MenuSeparatorExtraParams& extra) const {
SkPaint paint;
paint.setColor(GetSystemColor(NativeTheme::kColorId_MenuSeparatorColor));
- int position_y = rect.y() + rect.height() / 2;
- canvas->drawLine(rect.x(), position_y, rect.right(), position_y, paint);
+ int position_y = extra.paint_rect->y() + extra.paint_rect->height() / 2;
+ canvas->drawLine(extra.paint_rect->x(), position_y, extra.paint_rect->right(),
+ position_y, paint);
}
void NativeThemeWin::PaintMenuGutter(SkCanvas* canvas,
@@ -429,7 +432,7 @@ void NativeThemeWin::PaintDirect(SkCanvas* destination_canvas,
PaintMenuGutter(hdc, rect);
return;
case kMenuPopupSeparator:
- PaintMenuSeparator(hdc, rect);
+ PaintMenuSeparator(hdc, rect, extra.menu_separator);
return;
case kMenuItemBackground:
PaintMenuItemBackground(hdc, state, rect, extra.menu_item);
@@ -868,8 +871,9 @@ HRESULT NativeThemeWin::PaintButton(HDC hdc,
HRESULT NativeThemeWin::PaintMenuSeparator(
HDC hdc,
- const gfx::Rect& rect) const {
- RECT rect_win = rect.ToRECT();
+ const gfx::Rect& rect,
+ const MenuSeparatorExtraParams& extra) const {
+ RECT rect_win = extra.paint_rect->ToRECT();
HANDLE handle = GetThemeHandle(MENU);
if (handle && draw_theme_) {

Powered by Google App Engine
This is Rietveld 408576698