| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "views/controls/menu/menu_item_view.h" | 5 #include "views/controls/menu/menu_item_view.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "grit/app_resources.h" | 8 #include "grit/app_resources.h" |
| 9 #include "third_party/skia/include/effects/SkGradientShader.h" | 9 #include "third_party/skia/include/effects/SkGradientShader.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 font.GetStringWidth(title_) + label_start_ + | 34 font.GetStringWidth(title_) + label_start_ + |
| 35 item_right_margin_ + GetChildPreferredWidth(), | 35 item_right_margin_ + GetChildPreferredWidth(), |
| 36 content_height + GetBottomMargin() + GetTopMargin()); | 36 content_height + GetBottomMargin() + GetTopMargin()); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) { | 39 void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) { |
| 40 const MenuConfig& config = MenuConfig::instance(); | 40 const MenuConfig& config = MenuConfig::instance(); |
| 41 bool render_selection = | 41 bool render_selection = |
| 42 (!for_drag && IsSelected() && | 42 (!for_drag && IsSelected() && |
| 43 parent_menu_item_->GetSubmenu()->GetShowSelection(this) && | 43 parent_menu_item_->GetSubmenu()->GetShowSelection(this) && |
| 44 GetChildViewCount() == 0); | 44 !has_children()); |
| 45 | 45 |
| 46 int icon_x = config.item_left_margin; | 46 int icon_x = config.item_left_margin; |
| 47 int top_margin = GetTopMargin(); | 47 int top_margin = GetTopMargin(); |
| 48 int bottom_margin = GetBottomMargin(); | 48 int bottom_margin = GetBottomMargin(); |
| 49 int icon_y = top_margin + (height() - config.item_top_margin - | 49 int icon_y = top_margin + (height() - config.item_top_margin - |
| 50 bottom_margin - config.check_height) / 2; | 50 bottom_margin - config.check_height) / 2; |
| 51 int icon_height = config.check_height; | 51 int icon_height = config.check_height; |
| 52 int available_height = height() - top_margin - bottom_margin; | 52 int available_height = height() - top_margin - bottom_margin; |
| 53 | 53 |
| 54 // Render the background. As MenuScrollViewContainer draws the background, we | 54 // Render the background. As MenuScrollViewContainer draws the background, we |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 config.arrow_width) / 2, | 117 config.arrow_width) / 2, |
| 118 config.arrow_width, height()); | 118 config.arrow_width, height()); |
| 119 AdjustBoundsForRTLUI(&arrow_bounds); | 119 AdjustBoundsForRTLUI(&arrow_bounds); |
| 120 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 120 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 121 canvas->DrawBitmapInt(*rb.GetBitmapNamed(IDR_MENU_ARROW), | 121 canvas->DrawBitmapInt(*rb.GetBitmapNamed(IDR_MENU_ARROW), |
| 122 arrow_bounds.x(), arrow_bounds.y()); | 122 arrow_bounds.x(), arrow_bounds.y()); |
| 123 } | 123 } |
| 124 } | 124 } |
| 125 | 125 |
| 126 } // namespace views | 126 } // namespace views |
| OLD | NEW |