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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5f7b30aee28e70463311ed7f24fe8a58f600cbcb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5f7b30aee28e70463311ed7f24...

Author: Ken Thomases 
Date:   Sun Dec 29 21:33:20 2013 -0600

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

---

dlls/winemac.drv/cocoa_window.m |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 06647d9..bb2da55 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -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];
-            }
         }
     }