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

Side by Side Diff: views/controls/menu/menu_item_view_gtk.cc

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/controls/menu/menu_item_view.cc ('k') | views/controls/textfield/gtk_views_entry.cc » ('j') | 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) 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 "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "gfx/canvas_skia.h" 9 #include "gfx/canvas_skia.h"
10 #include "gfx/favicon_size.h" 10 #include "gfx/favicon_size.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 SkColor fg_color = 84 SkColor fg_color =
85 IsEnabled() ? TextButton::kEnabledColor : TextButton::kDisabledColor; 85 IsEnabled() ? TextButton::kEnabledColor : TextButton::kDisabledColor;
86 #endif 86 #endif
87 const gfx::Font& font = MenuConfig::instance().font; 87 const gfx::Font& font = MenuConfig::instance().font;
88 int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width(); 88 int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
89 int width = this->width() - item_right_margin_ - label_start_ - accel_width; 89 int width = this->width() - item_right_margin_ - label_start_ - accel_width;
90 gfx::Rect text_bounds(label_start_, top_margin + 90 gfx::Rect text_bounds(label_start_, top_margin +
91 (available_height - font.GetHeight()) / 2, width, 91 (available_height - font.GetHeight()) / 2, width,
92 font.GetHeight()); 92 font.GetHeight());
93 text_bounds.set_x(MirroredLeftPointForRect(text_bounds)); 93 text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
94 canvas->DrawStringInt(WideToUTF16Hack(GetTitle()), font, fg_color, 94 canvas->DrawStringInt(GetTitle(), font, fg_color,
95 text_bounds.x(), text_bounds.y(), text_bounds.width(), 95 text_bounds.x(), text_bounds.y(), text_bounds.width(),
96 text_bounds.height(), 96 text_bounds.height(),
97 GetRootMenuItem()->GetDrawStringFlags()); 97 GetRootMenuItem()->GetDrawStringFlags());
98 98
99 PaintAccelerator(canvas); 99 PaintAccelerator(canvas);
100 100
101 // Render the icon. 101 // Render the icon.
102 if (icon_.width() > 0) { 102 if (icon_.width() > 0) {
103 gfx::Rect icon_bounds(config.item_left_margin, 103 gfx::Rect icon_bounds(config.item_left_margin,
104 top_margin + (height() - top_margin - 104 top_margin + (height() - top_margin -
(...skipping 12 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « views/controls/menu/menu_item_view.cc ('k') | views/controls/textfield/gtk_views_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698