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

fix: send NSView* as the response to getNativeWindowHandle() instead of a null handle (#15521) (#15803)

Browse source
This commit is contained in:
Tom Moor 2018-11-27 18:00:37 -08:00 • committed by Cheng Zhao
parent 3ed5a24c72
commit 250a09a43f
6 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window_mac.h
View file

@ -8,6 +8,7 @@
#import <Cocoa/Cocoa.h>
#include <string>
#include <tuple>
#include <vector>
#include "atom/browser/native_window.h"
@ -103,6 +104,7 @@ class NativeWindowMac : public NativeWindow {
gfx::NativeView GetNativeView() const override;
gfx::NativeWindow GetNativeWindow() const override;
gfx::AcceleratedWidget GetAcceleratedWidget() const override;
std::tuple<void*, int> GetNativeWindowHandlePointer() const override;
void SetProgressBar(double progress, const ProgressState state) override;
void SetOverlayIcon(const gfx::Image& overlay,
const std::string& description) override;