From 7ddc99fd7fe36184b8b29388fde412faeee7dac5 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 14 Aug 2014 10:12:28 -0400 Subject: Merged xsizing_darwin.m into control_darwin.m. Even though alignment info is only currently used by Label, these functions are called in basegetAuxResizeInfo(), and who knows what will happen future. --- redo/control_darwin.m | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'redo/control_darwin.m') diff --git a/redo/control_darwin.m b/redo/control_darwin.m index ce1eca7..1b06114 100644 --- a/redo/control_darwin.m +++ b/redo/control_darwin.m @@ -58,3 +58,41 @@ id newScrollView(id content, BOOL bordered) [sv setBorderType:NSNoBorder]; return (id) sv; } + +// these function are safe to call on Areas; they'll just return the frame and a baseline of 0 since they use the default NSView implementations + +static struct xalignment doAlignmentInfo(NSView *v, NSRect r) +{ + struct xalignment a; + + r = [v alignmentRectForFrame:r]; + a.rect.x = (intptr_t) r.origin.x; + a.rect.y = (intptr_t) r.origin.y; + a.rect.width = (intptr_t) r.size.width; + a.rect.height = (intptr_t) r.size.height; + // I'm not sure if we need to set the frame for -[NSView baselineOffsetFromBottom], but let's do it just to be safe + [v setFrame:r]; + a.baseline = (intptr_t) [v baselineOffsetFromBottom]; + return a; +} + +struct xalignment alignmentInfo(id c, struct xrect newrect) +{ + NSView *v; + NSRect r; + + v = toNSView(c); + r = NSMakeRect((CGFloat) newrect.x, + (CGFloat) newrect.y, + (CGFloat) newrect.width, + (CGFloat) newrect.height); + return doAlignmentInfo(v, r); +} + +struct xalignment alignmentInfoFrame(id c) +{ + NSView *v; + + v = toNSView(c); + return doAlignmentInfo(v, [v frame]); +} -- cgit v1.2.3