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

linux: Dont' use native style border.

Browse source
This commit is contained in:
Cheng Zhao 2014-09-01 20:22:38 +08:00
parent 9546120ce4
commit d9d1d03d4d
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/gfx/text_utils.h" #include "ui/gfx/text_utils.h"
#include "ui/views/controls/button/label_button_border.h"
namespace atom { namespace atom {
@ -34,7 +35,11 @@ SubmenuButton::SubmenuButton(views::ButtonListener* listener,
text_width_(0), text_width_(0),
text_height_(0), text_height_(0),
underline_color_(SK_ColorBLACK) { underline_color_(SK_ColorBLACK) {
SetStyle(views::Button::STYLE_TEXTBUTTON); #if defined(OS_LINUX)
// Dont' use native style border.
SetBorder(CreateDefaultBorder().PassAs<views::Border>());
#endif
if (GetUnderlinePosition(title, &accelerator_, &underline_start_, if (GetUnderlinePosition(title, &accelerator_, &underline_start_,
&underline_end_)) &underline_end_))
gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_, gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_,