Module: wine Branch: master Commit: 3faf1a92b04a930359a16aa3de731a0423c2f867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faf1a92b04a930359a16aa3de...
Author: Ken Thomases ken@codeweavers.com Date: Mon Jun 17 23:35:56 2013 -0500
winemac: Don't bring disabled or no-activate windows forward when clicked.
---
dlls/winemac.drv/cocoa_app.m | 1 + dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fd481e5..2441b5d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1428,6 +1428,7 @@ int macdrv_err_on; NSEventType type = [theEvent type];
if ([window isKindOfClass:[WineWindow class]] && + !window.disabled && !window.noActivate && type == NSLeftMouseDown && (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 362d9aa..c5a630f 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -60,6 +60,8 @@ }
@property (retain, readonly, nonatomic) WineEventQueue* queue; +@property (readonly, nonatomic) BOOL disabled; +@property (readonly, nonatomic) BOOL noActivate; @property (readonly, nonatomic) BOOL floating; @property (readonly, getter=isFullscreen, nonatomic) BOOL fullscreen;
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3750931..cf63b25 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -136,8 +136,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
@interface WineWindow ()
-@property (nonatomic) BOOL disabled; -@property (nonatomic) BOOL noActivate; +@property (readwrite, nonatomic) BOOL disabled; +@property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; @property (retain, nonatomic) NSWindow* latentParentWindow;