winemac: Don't bring disabled or no-activate windows forward when clicked.

This commit is contained in:
Ken Thomases 2013-06-17 23:35:56 -05:00 committed by Alexandre Julliard
parent c14ff4bef0
commit 3faf1a92b0
3 changed files with 5 additions and 2 deletions

View File

@ -1428,6 +1428,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent
NSEventType type = [theEvent type];
if ([window isKindOfClass:[WineWindow class]] &&
!window.disabled && !window.noActivate &&
type == NSLeftMouseDown &&
(([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask))
{

View File

@ -60,6 +60,8 @@ @interface WineWindow : NSPanel <NSWindowDelegate>
}
@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;

View File

@ -136,8 +136,8 @@ - (void) updateGLContexts;
@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;