dwindows: mac/dw.m comparison

Fix mixing frame and content sizes on the Mac.

comparison

equal deleted inserted replaced

-:9097a5eb144c
+:7216f4301364
 if([ object isKindOfClass:[ NSWindow class ] ])
 {
 NSWindow *window = handle;
 Box *thisbox;
-NSSize size;
+NSRect content, frame = NSMakeRect(0, 0, width, height);
+/* Convert the external frame size to internal content size */
+content = [NSWindow contentRectForFrameRect:frame styleMask:[window styleMask]];
 /*
 * The following is an attempt to dynamically size a window based on the size of its
 * children before realization. Only applicable when width or height is less than one.
 */
 if((width < 1 || height < 1) && (thisbox = [[window contentView] box]))
 /* Calculate space requirements */
 _resize_box(thisbox, &depth, (int)width, (int)height, 1);
 /* Might need to take into account the window border here */
-if(width < 1) width = thisbox->minwidth;
+if(width < 1) content.size.width = thisbox->minwidth;
-if(height < 1) height = thisbox->minheight;
+if(height < 1) content.size.height = thisbox->minheight;
 }
 /* Finally set the size */
-size.width = width;
+[window setContentSize:content.size];
-size.height = height;
-[window setContentSize:size];
 }
 DW_MUTEX_UNLOCK;
 }
 /*

Mercurial > dwindows