interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

This commit is contained in:
Pietro Gagliardi 2014-08-14 10:12:28 -04:00
parent eb4b082d7f
commit 7ddc99fd7f
3 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
redo/control_darwin.m
View File

@ -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]);
}

2
redo/objc_darwin.h
View File

@ -93,8 +93,6 @@ extern void setStandardControlFont(id);
extern void setSmallControlFont(id);
extern struct xsize controlPreferredSize(id);
extern id newScrollView(id, BOOL);
/* xsizing_darwin.m */
extern struct xalignment alignmentInfo(id, struct xrect);
extern struct xalignment alignmentInfoFrame(id);

49
redo/xsizing_darwin.m
View File

@ -1,49 +0,0 @@
// 15 may 2014
#include "objc_darwin.h"
#import <Cocoa/Cocoa.h>
#define toNSControl(x) ((NSControl *) (x))
#define toNSTabView(x) ((NSTabView *) (x))
#define toNSScrollView(x) ((NSScrollView *) (x))
#define toNSView(x) ((NSView *) (x))
// TODO figure out where this should go
// 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]);
}