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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_views.cc
View file

@ -145,7 +145,6 @@ NativeWindowViews::NativeWindowViews(content::WebContents* web_contents,
params.bounds = bounds; params.bounds = bounds;
params.delegate = this; params.delegate = this;
params.type = views::Widget::InitParams::TYPE_WINDOW; params.type = views::Widget::InitParams::TYPE_WINDOW;
params.top_level = true;
params.remove_standard_frame = !has_frame_; params.remove_standard_frame = !has_frame_;
#if defined(USE_X11) #if defined(USE_X11)

5
atom/browser/ui/message_box_views.cc
View file

@ -71,7 +71,7 @@ class MessageDialog : public views::WidgetDelegate,
virtual views::ClientView* CreateClientView(views::Widget* widget) OVERRIDE; virtual views::ClientView* CreateClientView(views::Widget* widget) OVERRIDE;
// Overridden from views::View: // Overridden from views::View:
virtual gfx::Size GetPreferredSize() OVERRIDE; virtual gfx::Size GetPreferredSize() const OVERRIDE;
virtual void Layout() OVERRIDE; virtual void Layout() OVERRIDE;
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
@ -160,7 +160,6 @@ MessageDialog::MessageDialog(NativeWindow* parent_window,
views::Widget::InitParams params; views::Widget::InitParams params;
params.delegate = this; params.delegate = this;
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.top_level = true;
if (parent_) { if (parent_) {
params.parent = parent_->GetNativeWindow(); params.parent = parent_->GetNativeWindow();
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
@ -264,7 +263,7 @@ views::ClientView* MessageDialog::CreateClientView(views::Widget* widget) {
return new MessageDialogClientView(this, widget); return new MessageDialogClientView(this, widget);
} }
gfx::Size MessageDialog::GetPreferredSize() { gfx::Size MessageDialog::GetPreferredSize() const {
gfx::Size size(0, buttons_[0]->GetPreferredSize().height()); gfx::Size size(0, buttons_[0]->GetPreferredSize().height());
for (size_t i = 0; i < buttons_.size(); ++i) for (size_t i = 0; i < buttons_.size(); ++i)
size.Enlarge(buttons_[i]->GetPreferredSize().width(), 0); size.Enlarge(buttons_[i]->GetPreferredSize().width(), 0);

6
atom/browser/ui/views/frameless_view.cc
View file

@ -95,16 +95,16 @@ void FramelessView::UpdateWindowIcon() {
void FramelessView::UpdateWindowTitle() { void FramelessView::UpdateWindowTitle() {
} }
gfx::Size FramelessView::GetPreferredSize() { gfx::Size FramelessView::GetPreferredSize() const {
return frame_->non_client_view()->GetWindowBoundsForClientBounds( return frame_->non_client_view()->GetWindowBoundsForClientBounds(
gfx::Rect(frame_->client_view()->GetPreferredSize())).size(); gfx::Rect(frame_->client_view()->GetPreferredSize())).size();
} }
gfx::Size FramelessView::GetMinimumSize() { gfx::Size FramelessView::GetMinimumSize() const {
return window_->GetMinimumSize(); return window_->GetMinimumSize();
} }
gfx::Size FramelessView::GetMaximumSize() { gfx::Size FramelessView::GetMaximumSize() const {
return window_->GetMaximumSize(); return window_->GetMaximumSize();
} }

6
atom/browser/ui/views/frameless_view.h
View file

@ -38,9 +38,9 @@ class FramelessView : public views::NonClientFrameView {
virtual void UpdateWindowTitle() OVERRIDE; virtual void UpdateWindowTitle() OVERRIDE;
// Overridden from View: // Overridden from View:
virtual gfx::Size GetPreferredSize() OVERRIDE; virtual gfx::Size GetPreferredSize() const OVERRIDE;
virtual gfx::Size GetMinimumSize() OVERRIDE; virtual gfx::Size GetMinimumSize() const OVERRIDE;
virtual gfx::Size GetMaximumSize() OVERRIDE; virtual gfx::Size GetMaximumSize() const OVERRIDE;
virtual const char* GetClassName() const OVERRIDE; virtual const char* GetClassName() const OVERRIDE;
// Not owned. // Not owned.

8
atom/browser/ui/views/menu_bar.cc
View file

@ -74,10 +74,10 @@ void MenuBar::SetMenu(ui::MenuModel* model) {
button->set_tag(i); button->set_tag(i);
#if defined(USE_X11) #if defined(USE_X11)
button->SetEnabledColor(enabled_color_); button->SetTextColor(views::Button::STATE_NORMAL, enabled_color_);
button->SetDisabledColor(disabled_color_); button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
button->SetHighlightColor(highlight_color_); button->SetTextColor(views::Button::STATE_PRESSED, highlight_color_);
button->SetHoverColor(hover_color_); button->SetTextColor(views::Button::STATE_HOVERED, hover_color_);
button->SetUnderlineColor(enabled_color_); button->SetUnderlineColor(enabled_color_);
#elif defined(OS_WIN) #elif defined(OS_WIN)
button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_GRAYTEXT)); button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_GRAYTEXT));

2
atom/browser/ui/views/menu_delegate.cc
View file

@ -73,7 +73,7 @@ bool MenuDelegate::IsTriggerableEvent(views::MenuItemView* source,
return delegate()->IsTriggerableEvent(source, e); return delegate()->IsTriggerableEvent(source, e);
} }
bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) { bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) const {
return delegate()->GetAccelerator(id, accelerator); return delegate()->GetAccelerator(id, accelerator);
} }

2
atom/browser/ui/views/menu_delegate.h
View file

@ -35,7 +35,7 @@ class MenuDelegate : public views::MenuDelegate {
virtual bool IsTriggerableEvent(views::MenuItemView* source, virtual bool IsTriggerableEvent(views::MenuItemView* source,
const ui::Event& e) OVERRIDE; const ui::Event& e) OVERRIDE;
virtual bool GetAccelerator(int id, virtual bool GetAccelerator(int id,
ui::Accelerator* accelerator) OVERRIDE; ui::Accelerator* accelerator) const OVERRIDE;
virtual base::string16 GetLabel(int id) const OVERRIDE; virtual base::string16 GetLabel(int id) const OVERRIDE;
virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE; virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE;
virtual bool IsCommandEnabled(int id) const OVERRIDE; virtual bool IsCommandEnabled(int id) const OVERRIDE;

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

@ -30,7 +30,7 @@ void MenuLayout::Layout(views::View* host) {
menu_bar->SetBoundsRect(menu_Bar_bounds); menu_bar->SetBoundsRect(menu_Bar_bounds);
} }
gfx::Size MenuLayout::GetPreferredSize(views::View* host) { gfx::Size MenuLayout::GetPreferredSize(const views::View* host) const {
gfx::Size size = views::FillLayout::GetPreferredSize(host); gfx::Size size = views::FillLayout::GetPreferredSize(host);
if (!HasMenu(host)) if (!HasMenu(host))
return size; return size;
@ -39,7 +39,8 @@ gfx::Size MenuLayout::GetPreferredSize(views::View* host) {
return size; return size;
} }
int MenuLayout::GetPreferredHeightForWidth(views::View* host, int width) { int MenuLayout::GetPreferredHeightForWidth(
const views::View* host, int width) const {
int height = views::FillLayout::GetPreferredHeightForWidth(host, width); int height = views::FillLayout::GetPreferredHeightForWidth(host, width);
if (!HasMenu(host)) if (!HasMenu(host))
return height; return height;

5
atom/browser/ui/views/menu_layout.h
View file

@ -16,8 +16,9 @@ class MenuLayout : public views::FillLayout {
// views::LayoutManager: // views::LayoutManager:
virtual void Layout(views::View* host) OVERRIDE; virtual void Layout(views::View* host) OVERRIDE;
virtual gfx::Size GetPreferredSize(views::View* host) OVERRIDE; virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE;
virtual int GetPreferredHeightForWidth(views::View* host, int width) OVERRIDE; virtual int GetPreferredHeightForWidth(
const views::View* host, int width) const OVERRIDE;
private: private:
bool HasMenu(const views::View* host) const; bool HasMenu(const views::View* host) const;

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

@ -34,9 +34,10 @@ 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 (GetUnderlinePosition(title, &accelerator_, &underline_start_, if (GetUnderlinePosition(title, &accelerator_, &underline_start_,
&underline_end_)) &underline_end_))
gfx::Canvas::SizeStringInt(text(), font_list(), &text_width_, gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_,
&text_height_, 0, 0); &text_height_, 0, 0);
} }
@ -85,7 +86,7 @@ bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
void SubmenuButton::GetCharacterPosition( void SubmenuButton::GetCharacterPosition(
const base::string16& text, int index, int* pos) { const base::string16& text, int index, int* pos) {
int height; 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); 0, 0);
} }

3
atom/browser/ui/views/submenu_button.h
View file

@ -20,6 +20,9 @@ class SubmenuButton : public views::MenuButton {
void SetAcceleratorVisibility(bool visible); void SetAcceleratorVisibility(bool visible);
void SetUnderlineColor(SkColor color); void SetUnderlineColor(SkColor color);
void SetEnabledColor(SkColor color);
void SetBackgroundColor(SkColor color);
base::char16 accelerator() const { return accelerator_; } base::char16 accelerator() const { return accelerator_; }
// views::MenuButton: // views::MenuButton:

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 759cf77253e8d3996745b6f6aeedcf3cb9465bbb Subproject commit dafc85799ca31e3ddd7b5d0cc0ef7fbf38dcf88f