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

ci build fix

Browse source
This commit is contained in:
Heilig Benedek 2017-05-21 20:57:19 +02:00
parent 218e28b136
commit d5c038a7fb
4 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window.cc
View file

@ -251,7 +251,7 @@ void NativeWindow::SetSizeConstraints(
SetContentSizeConstraints(content_constraints); SetContentSizeConstraints(content_constraints);
} }
extensions::SizeConstraints NativeWindow::GetSizeConstraints() { extensions::SizeConstraints NativeWindow::GetSizeConstraints() const {
extensions::SizeConstraints content_constraints = GetContentSizeConstraints(); extensions::SizeConstraints content_constraints = GetContentSizeConstraints();
extensions::SizeConstraints window_constraints; extensions::SizeConstraints window_constraints;
if (content_constraints.HasMaximumSize()) { if (content_constraints.HasMaximumSize()) {
@ -272,7 +272,7 @@ void NativeWindow::SetContentSizeConstraints(
size_constraints_ = size_constraints; size_constraints_ = size_constraints;
} }
extensions::SizeConstraints NativeWindow::GetContentSizeConstraints() { extensions::SizeConstraints NativeWindow::GetContentSizeConstraints() const {
return size_constraints_; return size_constraints_;
} }
@ -282,7 +282,7 @@ void NativeWindow::SetMinimumSize(const gfx::Size& size) {
SetSizeConstraints(size_constraints); SetSizeConstraints(size_constraints);
} }
gfx::Size NativeWindow::GetMinimumSize() { gfx::Size NativeWindow::GetMinimumSize() const {
return GetSizeConstraints().GetMinimumSize(); return GetSizeConstraints().GetMinimumSize();
} }
@ -292,7 +292,7 @@ void NativeWindow::SetMaximumSize(const gfx::Size& size) {
SetSizeConstraints(size_constraints); SetSizeConstraints(size_constraints);
} }
gfx::Size NativeWindow::GetMaximumSize() { gfx::Size NativeWindow::GetMaximumSize() const {
return GetSizeConstraints().GetMaximumSize(); return GetSizeConstraints().GetMaximumSize();
} }

20
atom/browser/native_window.h
View file

@ -98,14 +98,14 @@ class NativeWindow : public base::SupportsUserData,
virtual gfx::Rect GetContentBounds(); virtual gfx::Rect GetContentBounds();
virtual void SetSizeConstraints( virtual void SetSizeConstraints(
const extensions::SizeConstraints& size_constraints); const extensions::SizeConstraints& size_constraints);
virtual extensions::SizeConstraints GetSizeConstraints(); virtual extensions::SizeConstraints GetSizeConstraints() const;
virtual void SetContentSizeConstraints( virtual void SetContentSizeConstraints(
const extensions::SizeConstraints& size_constraints); const extensions::SizeConstraints& size_constraints);
virtual extensions::SizeConstraints GetContentSizeConstraints(); virtual extensions::SizeConstraints GetContentSizeConstraints() const;
virtual void SetMinimumSize(const gfx::Size& size); virtual void SetMinimumSize(const gfx::Size& size);
virtual gfx::Size GetMinimumSize(); virtual gfx::Size GetMinimumSize() const;
virtual void SetMaximumSize(const gfx::Size& size); virtual void SetMaximumSize(const gfx::Size& size);
virtual gfx::Size GetMaximumSize(); virtual gfx::Size GetMaximumSize() const;
virtual void SetSheetOffset(const double offsetX, const double offsetY); virtual void SetSheetOffset(const double offsetX, const double offsetY);
virtual double GetSheetOffsetX(); virtual double GetSheetOffsetX();
virtual double GetSheetOffsetY(); virtual double GetSheetOffsetY();
@ -147,9 +147,9 @@ class NativeWindow : public base::SupportsUserData,
virtual void SetMenu(AtomMenuModel* menu); virtual void SetMenu(AtomMenuModel* menu);
virtual void SetParentWindow(NativeWindow* parent); virtual void SetParentWindow(NativeWindow* parent);
virtual void SetBrowserView(NativeBrowserView* browser_view) = 0; virtual void SetBrowserView(NativeBrowserView* browser_view) = 0;
virtual gfx::NativeView GetNativeView() = 0; virtual gfx::NativeView GetNativeView() const = 0;
virtual gfx::NativeWindow GetNativeWindow() = 0; virtual gfx::NativeWindow GetNativeWindow() const = 0;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0; virtual gfx::AcceleratedWidget GetAcceleratedWidget() const = 0;
// Taskbar/Dock APIs. // Taskbar/Dock APIs.
enum ProgressState { enum ProgressState {
@ -281,8 +281,10 @@ class NativeWindow : public base::SupportsUserData,
const std::vector<DraggableRegion>& regions); const std::vector<DraggableRegion>& regions);
// Converts between content bounds and window bounds. // Converts between content bounds and window bounds.
virtual gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) = 0; virtual gfx::Rect ContentBoundsToWindowBounds(
virtual gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) = 0; const gfx::Rect& bounds) const = 0;
virtual gfx::Rect WindowBoundsToContentBounds(
const gfx::Rect& bounds) const = 0;
// Called when the window needs to update its draggable region. // Called when the window needs to update its draggable region.
virtual void UpdateDraggableRegions( virtual void UpdateDraggableRegions(

14
atom/browser/native_window_views.cc
View file

@ -924,11 +924,11 @@ void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
#endif #endif
} }
gfx::NativeView NativeWindowViews::GetNativeView() { gfx::NativeView NativeWindowViews::GetNativeView() const {
return window_->GetNativeView(); return window_->GetNativeView();
} }
gfx::NativeWindow NativeWindowViews::GetNativeWindow() { gfx::NativeWindow NativeWindowViews::GetNativeWindow() const {
return window_->GetNativeWindow(); return window_->GetNativeWindow();
} }
@ -999,7 +999,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() {
return false; return false;
} }
gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() { gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() const {
return GetNativeWindow()->GetHost()->GetAcceleratedWidget(); return GetNativeWindow()->GetHost()->GetAcceleratedWidget();
} }
@ -1180,7 +1180,7 @@ void NativeWindowViews::OnWidgetMove() {
} }
gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds( gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
const gfx::Rect& bounds) { const gfx::Rect& bounds) const {
if (!has_frame()) if (!has_frame())
return bounds; return bounds;
@ -1201,7 +1201,7 @@ gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
} }
gfx::Rect NativeWindowViews::WindowBoundsToContentBounds( gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
const gfx::Rect& bounds) { const gfx::Rect& bounds) const {
if (!has_frame()) if (!has_frame())
return bounds; return bounds;
@ -1306,11 +1306,11 @@ void NativeWindowViews::Layout() {
} }
} }
gfx::Size NativeWindowViews::GetMinimumSize() { gfx::Size NativeWindowViews::GetMinimumSize() const {
return NativeWindow::GetMinimumSize(); return NativeWindow::GetMinimumSize();
} }
gfx::Size NativeWindowViews::GetMaximumSize() { gfx::Size NativeWindowViews::GetMaximumSize() const {
return NativeWindow::GetMaximumSize(); return NativeWindow::GetMaximumSize();
} }

14
atom/browser/native_window_views.h
View file

@ -106,8 +106,8 @@ class NativeWindowViews : public NativeWindow,
void SetMenu(AtomMenuModel* menu_model) override; void SetMenu(AtomMenuModel* menu_model) override;
void SetBrowserView(NativeBrowserView* browser_view) override; void SetBrowserView(NativeBrowserView* browser_view) override;
void SetParentWindow(NativeWindow* parent) override; void SetParentWindow(NativeWindow* parent) override;
gfx::NativeView GetNativeView() override; gfx::NativeView GetNativeView() const override;
gfx::NativeWindow GetNativeWindow() override; gfx::NativeWindow GetNativeWindow() const override;
void SetOverlayIcon(const gfx::Image& overlay, void SetOverlayIcon(const gfx::Image& overlay,
const std::string& description) override; const std::string& description) override;
void SetProgressBar(double progress, const ProgressState state) override; void SetProgressBar(double progress, const ProgressState state) override;
@ -118,7 +118,7 @@ class NativeWindowViews : public NativeWindow,
void SetVisibleOnAllWorkspaces(bool visible) override; void SetVisibleOnAllWorkspaces(bool visible) override;
bool IsVisibleOnAllWorkspaces() override; bool IsVisibleOnAllWorkspaces() override;
gfx::AcceleratedWidget GetAcceleratedWidget() override; gfx::AcceleratedWidget GetAcceleratedWidget() const override;
#if defined(OS_WIN) #if defined(OS_WIN)
void SetIcon(HICON small_icon, HICON app_icon); void SetIcon(HICON small_icon, HICON app_icon);
@ -171,16 +171,16 @@ class NativeWindowViews : public NativeWindow,
#endif #endif
// NativeWindow: // NativeWindow:
gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) override; gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) override; gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents*, content::WebContents*,
const content::NativeWebKeyboardEvent& event) override; const content::NativeWebKeyboardEvent& event) override;
// views::View: // views::View:
void Layout() override; void Layout() override;
gfx::Size GetMinimumSize() override; gfx::Size GetMinimumSize() const override;
gfx::Size GetMaximumSize() override; gfx::Size GetMaximumSize() const override;
bool AcceleratorPressed(const ui::Accelerator& accelerator) override; bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
// Register accelerators supported by the menu model. // Register accelerators supported by the menu model.