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

Disable resize during any stylemask change

Browse source
This commit is contained in:
Kevin Sawicki 2016-08-15 13:14:19 -07:00
parent c754b5efdc
commit 86e5bd3552
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/native_window_mac.mm
View file

@ -160,7 +160,7 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)windowDidMove:(NSNotification*)notification { - (void)windowDidMove:(NSNotification*)notification {
// TODO(zcbenz): Remove the alias after figuring out a proper // TODO(zcbenz): Remove the alias after figuring out a proper
// way to disptach move. // way to dispatch move.
shell_->NotifyWindowMove(); shell_->NotifyWindowMove();
shell_->NotifyWindowMoved(); shell_->NotifyWindowMoved();
} }
@ -321,6 +321,13 @@ bool ScopedDisableResize::disable_resize_ = false;
return [super constrainFrameRect:frameRect toScreen:screen]; return [super constrainFrameRect:frameRect toScreen:screen];
} }
- (void)setFrame:(NSRect)windowFrame display:(BOOL)displayViews {
// constrainFrameRect is not called on hidden windows so disable adjusting
// the frame directly when resize is disabled
if (!ScopedDisableResize::IsResizeDisabled())
[super setFrame:windowFrame display:displayViews];
}
- (id)accessibilityAttributeValue:(NSString*)attribute { - (id)accessibilityAttributeValue:(NSString*)attribute {
if (![attribute isEqualToString:@"AXChildren"]) if (![attribute isEqualToString:@"AXChildren"])
return [super accessibilityAttributeValue:attribute]; return [super accessibilityAttributeValue:attribute];
@ -784,9 +791,6 @@ void NativeWindowMac::SetContentSizeConstraints(
} }
void NativeWindowMac::SetResizable(bool resizable) { void NativeWindowMac::SetResizable(bool resizable) {
// Change styleMask for frameless causes the window to change size, so we have
// to explicitly disables that.
ScopedDisableResize disable_resize;
SetStyleMask(resizable, NSResizableWindowMask); SetStyleMask(resizable, NSResizableWindowMask);
} }
@ -1201,6 +1205,10 @@ void NativeWindowMac::UpdateDraggableRegionViews(
} }
void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) { void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
// Changing the styleMask of a frameless windows causes it to change size so
// we explicitly disable resizing while setting it.
ScopedDisableResize disable_resize;
bool was_maximizable = IsMaximizable(); bool was_maximizable = IsMaximizable();
if (on) if (on)
[window_ setStyleMask:[window_ styleMask] | flag]; [window_ setStyleMask:[window_ styleMask] | flag];