Commit 5f7b30ae authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method.

parent 2d1396af
......@@ -630,6 +630,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif
if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary)
[[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled];
}
if (disabled)
{
NSSize size = [self contentRectForFrameRect:[self frame]].size;
[self setContentMinSize:size];
[self setContentMaxSize:size];
}
else
{
[self setContentMaxSize:savedContentMaxSize];
[self setContentMinSize:savedContentMinSize];
}
}
- (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior
......@@ -1275,18 +1287,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif
{
disabled = newValue;
[self adjustFeaturesForState];
if (disabled)
{
NSSize size = [self contentRectForFrameRect:[self frame]].size;
[self setContentMinSize:size];
[self setContentMaxSize:size];
}
else
{
[self setContentMaxSize:savedContentMaxSize];
[self setContentMinSize:savedContentMinSize];
}
}
}
......
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