Commit Graph

773 Commits

Author SHA1 Message Date
appleguy
cb1081b759 Merge pull request #644 from rcancro/layoutOptions
Added ASLayoutOptions class to store all options for ASLayoutSpecs
2015-09-08 22:30:31 -07:00
rcancro
fc9d589cf9 Merge branch 'layoutOptions' of github.com:rcancro/AsyncDisplayKit into layoutOptions 2015-09-08 09:53:22 -07:00
rcancro
fe4a2d272f add locks to ASLayoutOptions 2015-09-08 09:50:47 -07:00
rcancro
b3369ca388 making ASLayoutOptions threadsafe 2015-09-08 09:50:47 -07:00
rcancro
fca43a651f Make layoutOptions readonly 2015-09-08 09:50:47 -07:00
rcancro
2a8b20b102 didn't mean to commit this 2015-09-08 09:50:47 -07:00
rcancro
5786bc1b5b Fixed infinite recursion in finalLayoutable, removed child properties from ASLayoutSpecs 2015-09-08 09:50:47 -07:00
rcancro
84cd80c41d bug in setting the ASLayoutOptions default class. 2015-09-08 09:50:47 -07:00
rcancro
36d00273fb wasn't copying layout options to final layoutable. 2015-09-08 09:50:47 -07:00
rcancro
8263a9f53a Kittens sample working 2015-09-08 09:50:47 -07:00
rcancro
cbaf178950 Hide ASLayoutOptions from the user 2015-09-08 09:50:47 -07:00
rcancro
15b3fd6eab Moved ASLayoutable* properties into ASLayoutOptions class 2015-09-08 09:50:27 -07:00
rcancro
61b72d2c46 fix kittens example 2015-09-08 09:49:40 -07:00
rcancro
7446578f6f Added method to ASLayoutable to allow a layoutable to override how it will be added to the layoutSpec.
Also moved ASStaticLayoutSpec to act more like the other layouts.
2015-09-08 09:49:40 -07:00
rcancro
ad95a7c3ea add locks to ASLayoutOptions 2015-09-08 09:48:59 -07:00
appleguy
052f4c44f1 Merge pull request #641 from facebook/ASCollectionNode
Created ASCollectionNode with new example project.
2015-09-07 15:15:25 -07:00
appleguy
4634b2bbb3 Merge pull request #642 from facebook/LayerBasedWorkingRange
Switch to use only layers in the offscreen window used for the render range.
2015-09-07 14:44:59 -07:00
Scott Goodson
a01d21f509 Switch to use only layers in the offscreen window used for the render range.
Accomodate and document unusual cases in which it is necessary to remove views when clearing backing stores.

ASDK layout and display calls don't depend on UIView in any way, so this
will achieve the necessary behavior of the render range while eliminating significant
UIView-specific overhead from heirarchy manipulation.
2015-09-07 14:20:57 -07:00
Scott Goodson
08e31e1c37 Created ASCollectionNode with new example project.
Eases support for nesting horizontally scrolling elements within a vertical scroller.

Further changes will improve the API, and optimize handling of the nested working ranges.
2015-09-07 12:54:42 -07:00
appleguy
de795d577a Merge pull request #635 from garrettmoon/fixShouldRasterizeSubnodes
Fix should rasterize subnodes
2015-09-03 01:28:43 -07:00
Garrett Moon
32582fca58 Fixes shouldRasterizeSubnodes
Currently, subnodes of nodes marked with shouldRasterizeSubnodes do not get layout calls. This adds the call to layout and changes the __layout method to reference self.bounds instead of _layer.bounds.

Also adds support for corner radius when rasterizing subnodes.
2015-09-01 13:25:27 -07:00
rcancro
bca7d838e1 making ASLayoutOptions threadsafe 2015-08-31 14:19:27 -07:00
rcancro
588cb27ec8 Merge remote-tracking branch 'upstream/master' into layoutOptions 2015-08-31 09:28:35 -07:00
appleguy
bdc5562080 Merge pull request #631 from nguyenhuy/relayout_preserves_frame_origin
When relayout a node, preserve its frame origin
2015-08-28 23:49:23 -07:00
appleguy
ecfacd0bd7 Merge pull request #621 from nguyenhuy/table_cell_node_min_width
New min constrained width for cell nodes in table view
2015-08-28 23:47:22 -07:00
appleguy
071dbd9dc2 Merge pull request #630 from garrettmoon/fixRangesOnNonFlowLayouts
scrollable directions was invalid for non-flow layouts as bounds and …
2015-08-28 23:43:49 -07:00
appleguy
4f2be6cf70 Merge pull request #634 from garrettmoon/fixStaticLayoutSpecs
array must be init'd otherwise arrayByAddingObject returns nil.
2015-08-28 23:43:12 -07:00
rcancro
b07078fed6 Make layoutOptions readonly 2015-08-28 20:41:40 -07:00
rcancro
b84cca0d4e didn't mean to commit this 2015-08-28 20:14:09 -07:00
rcancro
f6d6768985 Fixed infinite recursion in finalLayoutable, removed child properties from ASLayoutSpecs 2015-08-28 20:11:19 -07:00
rcancro
c1fef24c8a bug in setting the ASLayoutOptions default class. 2015-08-28 16:51:15 -07:00
rcancro
2155054c69 wasn't copying layout options to final layoutable. 2015-08-28 16:49:40 -07:00
rcancro
e6a07ffe58 Kittens sample working 2015-08-28 15:55:41 -07:00
rcancro
9a702a49ad Hide ASLayoutOptions from the user 2015-08-28 14:30:50 -07:00
Garrett Moon
62303ebeec array must be init'd otherwise arrayByAddingObject returns nil. 2015-08-28 13:37:39 -07:00
rcancro
afade854af Moved ASLayoutable* properties into ASLayoutOptions class 2015-08-28 09:36:22 -07:00
Huy Nguyen
075c39e398 When relayout a node, preserve its frame origin. 2015-08-27 21:16:39 +03:00
Garrett Moon
98b41a4b1c scrollable directions was invalid for non-flow layouts as bounds and contentSize were zero on init 2015-08-26 16:15:18 -07:00
rcancro
32e2f7f1ad fix kittens example 2015-08-25 14:37:34 -07:00
rcancro
499adb5145 Added method to ASLayoutable to allow a layoutable to override how it will be added to the layoutSpec.
Also moved ASStaticLayoutSpec to act more like the other layouts.
2015-08-25 14:04:06 -07:00
appleguy
9c51bde8e8 Merge pull request #611 from rcancro/baseline
Added baseline alignment for ASStackLayoutSpec.  Break up ASLayoutable into common, stack, and baseline protocol.
2015-08-24 14:26:33 -07:00
rcancro
9bf62d14ab Merge remote-tracking branch 'upstream/master' into baseline
# Conflicts:
#	AsyncDisplayKit/Layout/ASLayoutSpec.h
#	AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
2015-08-24 09:54:36 -07:00
appleguy
38eae3ab77 Merge pull request #623 from rcancro/layoutSpec
ASLayoutSpec are temporarily mutable and have a more obj-c interface
2015-08-23 11:31:07 -07:00
rcancro
1d31a21ccb Merge branch 'baseline' of github.com:rcancro/AsyncDisplayKit into baseline
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit/ASTextNode.h
#	AsyncDisplayKit/Details/ASDataController.mm
2015-08-22 19:14:59 -07:00
rcancro
e991242513 removed "Stack" from baseline related layout names 2015-08-22 19:03:55 -07:00
rcancro
49ac178166 huy's comments 2015-08-22 19:03:55 -07:00
rcancro
1424127813 fixed copyright 2015-08-22 19:03:54 -07:00
ricky cancro
5d286930f6 Renamed ASStackText... to ASBaselineStack... 2015-08-22 19:03:54 -07:00
rcancro
830d39af92 fixed bug for baseline last 2015-08-22 19:03:54 -07:00
ricky cancro
2d6ddfe32e moved baseline alignment to a layout spec. 2015-08-22 19:03:54 -07:00