From e058d2e14344cf8f7b06ee9eef18008fd6dd34cd Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Thu, 21 Nov 2013 17:42:43 -0800 Subject: [PATCH] Fixed: when doubleClicking to open/close a sheet, issues with the parentWindow and the frameOrigin of the sheet When opening a sheet, with a double click the frame origin of the sheet changed and the parent disappeared. This PR fix this issue. Test app in Tests/Manual/AttachedSheet/AppController.j --- AppKit/CPWindow/CPWindow.j | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j index 0b37388fd..f6ea01d2d 100644 --- a/AppKit/CPWindow/CPWindow.j +++ b/AppKit/CPWindow/CPWindow.j @@ -1699,11 +1699,17 @@ CPTexturedBackgroundWindowMask switch (type) { case CPLeftMouseDown: + + // This is needed when a doubleClick occurs when the sheet is closing or opening + if (!_parentWindow) + return; + [_windowView mouseDown:anEvent]; // -dw- if the window is clicked, the sheet should come to front, and become key, // and the window should be immediately behind [sheet makeKeyAndOrderFront:self]; + return; case CPMouseMoved: