colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

NEW: CPSplitView modern Cocoa behavior implementation (#2876)

Browse Source
This commit is contained in:
Didier Korthoudt
2020-02-21 14:32:53 +01:00
committed by GitHub
parent 1c866931f3
commit ba6350e24d
3 changed files with 929 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPSplitView.j
+902 -514
View File
File diff suppressed because it is too large Load Diff
Tests/AppKit/CPSplitViewTest.j
+12 -9
View File
@@ -17,9 +17,12 @@
viewA = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 100, 50)];
viewB = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 100, 50)];
[splitView addSubview:viewA];
[splitView addSubview:viewB];
[splitView setArrangesAllSubviews:YES];
[splitView setDividerStyle:CPSplitViewDividerStyleThin];
[splitView setVertical:NO];
[splitView addArrangedSubview:viewA];
[splitView addArrangedSubview:viewB];
[splitView adjustSubviews];
[splitView setPosition:50 ofDividerAtIndex:0];
}
@@ -46,9 +49,8 @@
// And for multiple areas.
var viewC = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 200, 50)];
[splitView addSubview:viewC];
// Force an immediate adjustment of subview sizes.
[splitView viewWillDraw];
[splitView addArrangedSubview:viewC];
[splitView adjustSubviews];
[self assert:26 equals:[viewA frameSize].height message:"adding viewC shrinks viewA"];
[self assert:39 equals:[viewB frameSize].height message:"adding viewC shrinks viewB"];
[self assert:33 equals:[viewC frameSize].height message:"new viewC is fit into remaining space"];
@@ -80,7 +82,8 @@
// Should work just as well with three views.
var viewC = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 200, 50)];
[splitView addSubview:viewC];
[splitView addArrangedSubview:viewC];
[splitView adjustSubviews];
[splitView setPosition:50 ofDividerAtIndex:0];
[splitView setPosition:100 ofDividerAtIndex:1];
@@ -103,8 +106,8 @@
// Regrow
[splitView setFrame:CGRectMake(0, 0, 200, 100)];
[self assert:38 equals:[viewA frameSize].height];
[self assert:30 equals:[viewB frameSize].height];
[self assert:30 equals:[viewC frameSize].height];
[self assert:20 equals:[viewB frameSize].height]; // was 30
[self assert:40 equals:[viewC frameSize].height]; // was 30
}
- (void)testAutosave
@@ -142,7 +145,7 @@
- (BOOL)splitView:(CPSplitView)splitView shouldAdjustSizeOfSubview:(CPView)subview
{
var subviews = [splitView subviews];
var subviews = [splitView arrangedSubviews];
return (subview !== [subviews firstObject]);
}
Tools/nib2cib/NSSplitView.j
+15 -1
View File
@@ -30,13 +30,27 @@ var NSThinDividerStyle = 2;
{
if (self = [super NS_initWithCoder:aCoder])
{
self._isVertical = [aCoder decodeBoolForKey:@"NSIsVertical"];
[self _init];
[self _setVertical:[aCoder decodeBoolForKey:@"NSIsVertical"]];
// TODO: the _isPaneSplitter is no more used. This should be removed someday.
// The possible values appear to be: no value (thick divider), 2 (thin divider) and 3 (pane splitter). For
// Cappuccino's purposes we treat thick divider and pane splitter as the same thing since the only difference
// seems to be graphical.
self._isPaneSplitter = [aCoder decodeIntForKey:@"NSDividerStyle"] != NSThinDividerStyle;
[self setDividerStyle:[aCoder decodeIntForKey:@"NSDividerStyle"]];
// Xcode IB seems to forget to specify a value for thick dividers.
if ([self dividerStyle] < 1)
[self setDividerStyle:CPSplitViewDividerStyleThick];
// IMPORTANT REMARK:
// Subviews received from Xcode IB are in fact arranged subviews !!!
// This will be treated in CPSplitView -initWithCoder
self._autosaveName = [aCoder decodeObjectForKey:@"NSAutosaveName"];
}