interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some of the uiBox glitches.

This commit is contained in:
Pietro Gagliardi 2016-05-01 11:25:35 -04:00
parent b653a8ac2c
commit aecbf078d3
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
darwin/box.m
View File

@ -2,11 +2,24 @@
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
// TODOs: // TODOs:
// - page 2 isn't growable - I think this is because the button in the tab isn't stretchy // - page 2 is growable but the wrong control grows
// - tab on page 2 is glitched // - tab on page 2 is glitched
// - separators on page 4 have variable padding after them // - separators on page 4 have variable padding after them
// - 10.8: if we switch to page 4, then switch back to page 1, check Spaced, and go back to page 4, some controls (progress bar, popup button) are clipped on the sides // - 10.8: if we switch to page 4, then switch back to page 1, check Spaced, and go back to page 4, some controls (progress bar, popup button) are clipped on the sides
// - wrong padding between controls in the queuemaintest and the control gallery...
// the default is to have no intrinsic content size; this wreaks havoc with nested no-stretchy boxes fighting over which box gets the remaining space
// let's use a 0x0 intrinsic size instead; that seems to fix things
@interface libuiNoStretchyView : NSView
@end
@implementation libuiNoStretchyView
- (NSSize)intrinsicContentSize
{
return NSMakeSize(0, 0);
}
@end
struct uiBox { struct uiBox {
uiDarwinControl c; uiDarwinControl c;
@ -310,7 +323,7 @@ static uiBox *finishNewBox(BOOL vertical)
b->secondaryOrientation = NSLayoutConstraintOrientationVertical; b->secondaryOrientation = NSLayoutConstraintOrientationVertical;
} }
b->noStretchyView = [[NSView alloc] initWithFrame:NSZeroRect]; b->noStretchyView = [[libuiNoStretchyView alloc] initWithFrame:NSZeroRect];
[b->noStretchyView setTranslatesAutoresizingMaskIntoConstraints:NO]; [b->noStretchyView setTranslatesAutoresizingMaskIntoConstraints:NO];
setHuggingPri(b->noStretchyView, NSLayoutPriorityDefaultLow, NSLayoutConstraintOrientationHorizontal); setHuggingPri(b->noStretchyView, NSLayoutPriorityDefaultLow, NSLayoutConstraintOrientationHorizontal);
setHuggingPri(b->noStretchyView, NSLayoutPriorityDefaultLow, NSLayoutConstraintOrientationVertical); setHuggingPri(b->noStretchyView, NSLayoutPriorityDefaultLow, NSLayoutConstraintOrientationVertical);