Commit 4b2f4eb6 authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

winemac: Remove some duplicated code from -makeKeyAndOrderFront:.

parent 315b39ec
...@@ -1119,26 +1119,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) ...@@ -1119,26 +1119,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
/* We don't call this. It's the action method of the items in the Window menu. */ /* We don't call this. It's the action method of the items in the Window menu. */
- (void) makeKeyAndOrderFront:(id)sender - (void) makeKeyAndOrderFront:(id)sender
{ {
WineApplicationController* controller = [WineApplicationController sharedController];
WineWindow* front = [controller frontWineWindow];
BOOL wasVisible = [self isVisible];
if (![self isKeyWindow] && !self.disabled && !self.noActivate) if (![self isKeyWindow] && !self.disabled && !self.noActivate)
[controller windowGotFocus:self]; [[WineApplicationController sharedController] windowGotFocus:self];
if (front && [self level] < [front level]) if ([self isMiniaturized])
[self setLevel:[front level]]; [self deminiaturize:nil];
[self orderFront:nil]; [self orderBelow:nil orAbove:nil activate:NO];
if (!wasVisible && fullscreen && [self isOnActiveSpace])
[controller updateFullscreenWindows];
[controller adjustWindowLevels];
if (pendingMinimize)
{
ignore_windowMiniaturize = TRUE;
[self miniaturize:nil];
pendingMinimize = FALSE;
}
} }
- (void) sendEvent:(NSEvent*)event - (void) sendEvent:(NSEvent*)event
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment