Skip to content

Commit

Permalink
feat: add NSPanel support for BrowserWindow
Browse files Browse the repository at this point in the history
  • Loading branch information
isailaandrei committed Jun 2, 2022
1 parent eb9888d commit 64e1e71
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 4 deletions.
6 changes: 5 additions & 1 deletion docs/api/browser-window.md
Expand Up @@ -425,13 +425,17 @@ Possible values are:

* On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
`notification`.
* On macOS, possible types are `desktop`, `textured`.
* On macOS, possible types are `desktop`, `textured`, `panel`.
* The `textured` type adds metal gradient appearance
(`NSWindowStyleMaskTexturedBackground`).
* The `desktop` type places the window at the desktop background window level
(`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
focus, keyboard or mouse events, but you can use `globalShortcut` to receive
input sparingly.
* The `panel` type sets the window level to float (`NSFloatingWindowLevel`) and
makes it appear in all spaces. The `NSWindowStyleMaskNonactivatingPanel` style
mask is added on runtime, such that the window can float on top of full-screened
apps.
* On Windows, possible type is `toolbar`.

### Instance Events
Expand Down
2 changes: 2 additions & 0 deletions filenames.gni
Expand Up @@ -165,6 +165,8 @@ filenames = {
"shell/browser/ui/cocoa/electron_native_widget_mac.mm",
"shell/browser/ui/cocoa/electron_ns_window_delegate.h",
"shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
"shell/browser/ui/cocoa/electron_ns_panel.h",
"shell/browser/ui/cocoa/electron_ns_panel.mm",
"shell/browser/ui/cocoa/electron_ns_window.h",
"shell/browser/ui/cocoa/electron_ns_window.mm",
"shell/browser/ui/cocoa/electron_preview_item.h",
Expand Down
7 changes: 6 additions & 1 deletion shell/browser/native_window_mac.mm
Expand Up @@ -317,7 +317,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
params.bounds = bounds;
params.delegate = this;
params.type = views::Widget::InitParams::TYPE_WINDOW;
params.native_widget = new ElectronNativeWidgetMac(this, styleMask, widget());
params.native_widget =
new ElectronNativeWidgetMac(this, windowType, styleMask, widget());
widget()->Init(std::move(params));
SetCanResize(resizable);
window_ = static_cast<ElectronNSWindow*>(
Expand Down Expand Up @@ -355,6 +356,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
NSWindowCollectionBehaviorIgnoresCycle)];
}

if (windowType == "panel") {
[window_ setLevel:NSFloatingWindowLevel];
}

bool focusable;
if (options.Get(options::kFocusable, &focusable) && !focusable)
[window_ setDisableKeyOrMainWindow:YES];
Expand Down
3 changes: 3 additions & 0 deletions shell/browser/ui/cocoa/electron_native_widget_mac.h
Expand Up @@ -5,6 +5,7 @@
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NATIVE_WIDGET_MAC_H_
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NATIVE_WIDGET_MAC_H_

#include <string>
#include "ui/views/widget/native_widget_mac.h"

namespace electron {
Expand All @@ -14,6 +15,7 @@ class NativeWindowMac;
class ElectronNativeWidgetMac : public views::NativeWidgetMac {
public:
ElectronNativeWidgetMac(NativeWindowMac* shell,
const std::string& window_type,
NSUInteger style_mask,
views::internal::NativeWidgetDelegate* delegate);
~ElectronNativeWidgetMac() override;
Expand All @@ -29,6 +31,7 @@ class ElectronNativeWidgetMac : public views::NativeWidgetMac {

private:
NativeWindowMac* shell_;
std::string window_type_;
NSUInteger style_mask_;
};

Expand Down
13 changes: 11 additions & 2 deletions shell/browser/ui/cocoa/electron_native_widget_mac.mm
Expand Up @@ -4,24 +4,33 @@

#include "shell/browser/ui/cocoa/electron_native_widget_mac.h"

#include <string>
#include "shell/browser/ui/cocoa/electron_ns_panel.h"
#include "shell/browser/ui/cocoa/electron_ns_window.h"

namespace electron {

ElectronNativeWidgetMac::ElectronNativeWidgetMac(
NativeWindowMac* shell,
const std::string& window_type,
NSUInteger style_mask,
views::internal::NativeWidgetDelegate* delegate)
: views::NativeWidgetMac(delegate),
shell_(shell),
window_type_(window_type),
style_mask_(style_mask) {}

ElectronNativeWidgetMac::~ElectronNativeWidgetMac() = default;

NativeWidgetMacNSWindow* ElectronNativeWidgetMac::CreateNSWindow(
const remote_cocoa::mojom::CreateWindowParams* params) {
return [[[ElectronNSWindow alloc] initWithShell:shell_
styleMask:style_mask_] autorelease];
if (window_type_ == "panel") {
return [[[ElectronNSPanel alloc] initWithShell:shell_
styleMask:style_mask_] autorelease];
} else {
return [[[ElectronNSWindow alloc] initWithShell:shell_
styleMask:style_mask_] autorelease];
}
}

} // namespace electron
17 changes: 17 additions & 0 deletions shell/browser/ui/cocoa/electron_ns_panel.h
@@ -0,0 +1,17 @@
// Copyright (c) 2022 Microsoft, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.

#ifndef SHELL_BROWSER_UI_COCOA_ELECTRON_NS_PANEL_H_
#define SHELL_BROWSER_UI_COCOA_ELECTRON_NS_PANEL_H_

#include "shell/browser/ui/cocoa/electron_ns_window.h"

@interface ElectronNSPanel : ElectronNSWindow
@property NSWindowStyleMask styleMask;
@property NSWindowStyleMask originalStyleMask;
- (id)initWithShell:(electron::NativeWindowMac*)shell
styleMask:(NSUInteger)styleMask;
@end

#endif // SHELL_BROWSER_UI_COCOA_ELECTRON_NS_PANEL_H_
39 changes: 39 additions & 0 deletions shell/browser/ui/cocoa/electron_ns_panel.mm
@@ -0,0 +1,39 @@
// Copyright (c) 2022 Microsoft, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.

#include "shell/browser/ui/cocoa/electron_ns_panel.h"

@implementation ElectronNSPanel

@synthesize originalStyleMask;

- (id)initWithShell:(electron::NativeWindowMac*)shell
styleMask:(NSUInteger)styleMask {
if (self = [super initWithShell:shell styleMask:styleMask]) {
originalStyleMask = styleMask;
}
return self;
}

@dynamic styleMask;
// The Nonactivating mask is reserverd for NSPanel,
// but we can use this workaround to add it at runtime
- (NSWindowStyleMask)styleMask {
return originalStyleMask | NSWindowStyleMaskNonactivatingPanel;
}

- (void)setStyleMask:(NSWindowStyleMask)styleMask {
originalStyleMask = styleMask;
// Notify change of style mask.
[super setStyleMask:styleMask];
}

- (void)setCollectionBehavior:(NSWindowCollectionBehavior)collectionBehavior {
NSWindowCollectionBehavior panelBehavior =
(NSWindowCollectionBehaviorCanJoinAllSpaces |
NSWindowCollectionBehaviorFullScreenAuxiliary);
[super setCollectionBehavior:collectionBehavior | panelBehavior];
}

@end

0 comments on commit 64e1e71

Please sign in to comment.