mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

linux: Fix API changes of Chrome 37.

Browse source
This commit is contained in:
Cheng Zhao 2014-09-01 20:10:14 +08:00
parent 48a5591508
commit 9546120ce4
12 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/ui/views/submenu_button.cc
View file

@ -34,9 +34,10 @@ SubmenuButton::SubmenuButton(views::ButtonListener* listener,
text_width_(0),
text_height_(0),
underline_color_(SK_ColorBLACK) {
SetStyle(views::Button::STYLE_TEXTBUTTON);
if (GetUnderlinePosition(title, &accelerator_, &underline_start_,
&underline_end_))
gfx::Canvas::SizeStringInt(text(), font_list(), &text_width_,
gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_,
&text_height_, 0, 0);
}
@ -85,7 +86,7 @@ bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
void SubmenuButton::GetCharacterPosition(
const base::string16& text, int index, int* pos) {
int height;
gfx::Canvas::SizeStringInt(text.substr(0, index), font_list(), pos, &height,
gfx::Canvas::SizeStringInt(text.substr(0, index), GetFontList(), pos, &height,
0, 0);
}