Skip to content

Commit da2b25c

Browse files
author
Michael Morrison
committed
Only apply clickthrough bounds when resizable
Fixes nwjs#594 Improves nwjs#588 (still broken on resizable windows)
1 parent 42348ee commit da2b25c

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/browser/native_window_win.cc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -613,18 +613,17 @@ void NativeWindowWin::OnViewWasResized() {
613613
SetWindowRgn(web_contents()->GetNativeView(), path.CreateNativeRegion(), 1);
614614

615615
SkRegion* rgn = new SkRegion;
616-
if (!window_->IsFullscreen()) {
616+
if (!window_->IsFullscreen() && !window_->IsMaximized()) {
617617
if (draggable_region())
618618
rgn->op(*draggable_region(), SkRegion::kUnion_Op);
619-
if (!window_->IsMaximized()) {
620-
if (!has_frame()) {
621-
rgn->op(0, 0, width, kResizeInsideBoundsSize, SkRegion::kUnion_Op);
622-
rgn->op(0, 0, kResizeInsideBoundsSize, height, SkRegion::kUnion_Op);
623-
rgn->op(width - kResizeInsideBoundsSize, 0, width, height,
624-
SkRegion::kUnion_Op);
625-
rgn->op(0, height - kResizeInsideBoundsSize, width, height,
626-
SkRegion::kUnion_Op);
627-
}
619+
620+
if (!has_frame() && CanResize()) {
621+
rgn->op(0, 0, width, kResizeInsideBoundsSize, SkRegion::kUnion_Op);
622+
rgn->op(0, 0, kResizeInsideBoundsSize, height, SkRegion::kUnion_Op);
623+
rgn->op(width - kResizeInsideBoundsSize, 0, width, height,
624+
SkRegion::kUnion_Op);
625+
rgn->op(0, height - kResizeInsideBoundsSize, width, height,
626+
SkRegion::kUnion_Op);
628627
}
629628
}
630629
if (web_contents()->GetRenderViewHost()->GetView())

0 commit comments

Comments
 (0)