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

Update workspace visible APIs.

Browse source
This commit is contained in:
Haojian Wu 2015-03-27 19:41:07 +08:00
parent 296d5c4515
commit 0342854e25
9 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_mac.mm
View file

@ -310,7 +310,6 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents,
const mate::Dictionary& options)
: NativeWindow(web_contents, options),
is_kiosk_(false),
is_visible_on_all_workspaces_(false),
attention_request_id_(0) {
int width = 800, height = 600;
options.Get(switches::kWidth, &width);
@ -695,7 +694,6 @@ void NativeWindowMac::ShowDefinitionForSelection() {
void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible) {
NSUInteger collectionBehavior = [window_ collectionBehavior];
is_visible_on_all_workspaces_ = visible;
if (visible) {
collectionBehavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
} else {
@ -705,7 +703,8 @@ void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible) {
}
bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
return is_visible_on_all_workspaces_;
NSUInteger collectionBehavior = [window_ collectionBehavior];
return collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
}
bool NativeWindowMac::IsWithinDraggableRegion(NSPoint point) const {