Ken Thomases : winemac: Don't set Cocoa window frame to be zero-sized.

Alexandre Julliard julliard at winehq.org
Mon Feb 18 13:27:05 CST 2013


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

Author: Ken Thomases <ken at codeweavers.com>
Date:   Sun Feb 17 19:28:19 2013 -0600

winemac: Don't set Cocoa window frame to be zero-sized.

---

 dlls/winemac.drv/cocoa_window.m |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 2247d32..d8ea9ed 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -429,14 +429,17 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
                 [self doOrderOut];
         }
 
-        oldFrame = [self frame];
-        frame = [self frameRectForContentRect:contentRect];
-        if (!NSEqualRects(frame, oldFrame))
+        if (!NSIsEmptyRect(contentRect))
         {
-            if (NSEqualSizes(frame.size, oldFrame.size))
-                [self setFrameOrigin:frame.origin];
-            else
-                [self setFrame:frame display:YES];
+            oldFrame = [self frame];
+            frame = [self frameRectForContentRect:contentRect];
+            if (!NSEqualRects(frame, oldFrame))
+            {
+                if (NSEqualSizes(frame.size, oldFrame.size))
+                    [self setFrameOrigin:frame.origin];
+                else
+                    [self setFrame:frame display:YES];
+            }
         }
 
         if (on_screen)




More information about the wine-cvs mailing list